From a06131872dd8849fa2a0905217cd68e128682fdc Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 1 Nov 2007 15:32:27 +0000 Subject: [PATCH] Harden dnssec stripped zones. git-svn-id: file:///svn/unbound/trunk@730 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 2 + doc/example.conf | 6 + doc/unbound.conf.5 | 9 + testdata/val_faildnskey.rpl | 11 +- testdata/val_faildnskey_ok.rpl | 126 +++++ util/config_file.c | 1 + util/config_file.h | 2 + util/configlexer.c | 986 +++++++++++++++++---------------- util/configlexer.lex | 1 + util/configparser.c | 550 +++++++++--------- util/configparser.h | 6 +- util/configparser.y | 15 +- validator/validator.c | 19 +- 13 files changed, 965 insertions(+), 769 deletions(-) create mode 100644 testdata/val_faildnskey_ok.rpl diff --git a/doc/Changelog b/doc/Changelog index e3afd7d9b..1f79b38a9 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -7,6 +7,8 @@ - VERB_DETAIL prints out what chdir, username, chroot is being done. - when id numbers run out, caches are cleared, as in design notes. Tested with a mock setup with very few bits in id, it worked. + - harden-dnssec-stripped: yes is now default. It insists on dnssec + data for trust anchors. Included tests for the feature. 31 October 2007: Wouter - cache-max-ttl config option. diff --git a/doc/example.conf b/doc/example.conf index 378f987f8..932fdf618 100644 --- a/doc/example.conf +++ b/doc/example.conf @@ -171,6 +171,12 @@ server: # Harden against out of zone rrsets, to avoid spoofing attempts. # harden-glue: yes + # Harden against receiving dnssec-stripped data. If you turn it + # off, receiving no dnssec dnskey data (at all) for a trustanchor will + # trigger insecure mode for that zone (like without a trustanchor). + # Default on, which insists on dnssec data for trust-anchored zones. + # harden-dnssec-stripped: yes + # Do not query the following addresses. No DNS queries are sent there. # List one address per entry. List classless netblocks with /size, # do-not-query-address: 127.0.0.1/8 diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5 index f05b3011a..65bc29c21 100644 --- a/doc/unbound.conf.5 +++ b/doc/unbound.conf.5 @@ -231,6 +231,15 @@ wise to send these, and could be necessary for operation if TSIG or EDNS payload is very large. .It \fBharden-glue:\fR Will trust glue only if it is within the servers authority. Default is on. +.It \fBharden-dnssec-stripped:\fR +Require DNSSEC data for trust-anchored zones, if such data is absent, +the zone becomes bogus. If turned off, and no DNSSEC data is received +(no DNSKEY data to be precise), then the zone is made insecure, this behaves +like there is no trust anchor. You could turn this off if you are sometimes +behind an intrusive firewall (of some sort) that removes DNSSEC data from +packets, or a zone changes from signed to unsigned often. If turned off you +run the risk of a downgrade attack that disables security for a zone. +Default is on. .It \fBdo-not-query-address:\fR Do not query the given IP address. Can be IP4 or IP6. Append /num to indicate a classless delegation netblock, for example like diff --git a/testdata/val_faildnskey.rpl b/testdata/val_faildnskey.rpl index 821956a0e..3c6eaaa90 100644 --- a/testdata/val_faildnskey.rpl +++ b/testdata/val_faildnskey.rpl @@ -3,6 +3,7 @@ server: trust-anchor: "example.com. 3600 IN DS 2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b" val-override-date: "20070916134226" + # test that default value of harden-dnssec-stripped is still yes. stub-zone: name: "." @@ -108,18 +109,10 @@ ENTRY_END STEP 10 CHECK_ANSWER ENTRY_BEGIN MATCH all -REPLY QR RD RA NOERROR +REPLY QR RD RA SERVFAIL SECTION QUESTION www.example.com. IN A SECTION ANSWER -www.example.com. IN A 10.20.30.40 -www.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854} -SECTION AUTHORITY -example.com. IN NS ns.example.com. -example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} -SECTION ADDITIONAL -ns.example.com. IN A 1.2.3.4 -ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854} ENTRY_END SCENARIO_END diff --git a/testdata/val_faildnskey_ok.rpl b/testdata/val_faildnskey_ok.rpl new file mode 100644 index 000000000..997412249 --- /dev/null +++ b/testdata/val_faildnskey_ok.rpl @@ -0,0 +1,126 @@ +; config options +; The island of trust is at example.com +server: + trust-anchor: "example.com. 3600 IN DS 2854 3 1 46e4ffc6e9a4793b488954bd3f0cc6af0dfb201b" + val-override-date: "20070916134226" + harden-dnssec-stripped: no + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test validator with failed DNSKEY request, but not hardened. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.4 + +; response to DNSKEY priming query +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +;REPLY QR AA NOERROR +REPLY QR AA SERVFAIL +SECTION QUESTION +example.com. IN DNSKEY +SECTION ANSWER +;example.com. 3600 IN DNSKEY 256 3 3 ALXLUsWqUrY3JYER3T4TBJII s70j+sDS/UT2QRp61SE7S3E EXopNXoFE73JLRmvpi/UrOO/Vz4Se 6wXv/CYCKjGw06U4WRgR YXcpEhJROyNapmdIKSx hOzfLVE1gqA0PweZR8d tY3aNQSRn3sPpwJr6Mi /PqQKAMMrZ9ckJpf1+b QMOOvxgzz2U1GS18b3y ZKcgTMEaJzd/GZYzi/B N2DzQ0MsrSwYXfsNLFO Bbs8PJMW4LYIxeeOe6rUgkWOF 7CC9Dh/dduQ1QrsJhmZAEFfd6ByYV+ ;{id = 2854 (zsk), size = 1688b} +;example.com. 3600 IN RRSIG DNSKEY 3 2 3600 20070926134802 20070829134802 2854 example.com. MCwCFG1yhRNtTEa3Eno2zhVVuy2EJX3wAhQeLyUp6+UXcpC5qGNu9tkrTEgPUg== ;{id = 2854} +;SECTION AUTHORITY +;example.com. IN NS ns.example.com. +;example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +;SECTION ADDITIONAL +;ns.example.com. IN A 1.2.3.4 +;ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854} +ENTRY_END + +; response to query of interest +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854} +SECTION AUTHORITY +example.com. IN NS ns.example.com. +example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +www.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854} +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +www.example.com. IN A +ENTRY_END + +; recursion happens here. +STEP 10 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +www.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFC99iE9K5y2WNgI0gFvBWaTi9wm6AhUAoUqOpDtG5Zct+Qr9F3mSdnbc6V4= ;{id = 2854} +SECTION AUTHORITY +example.com. IN NS ns.example.com. +example.com. 3600 IN RRSIG NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854} +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ns.example.com. 3600 IN RRSIG A 3 3 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCQMyTjn7WWwpwAR1LlVeLpRgZGuQIUCcJDEkwAuzytTDRlYK7nIMwH1CM= ;{id = 2854} +ENTRY_END + +SCENARIO_END diff --git a/util/config_file.c b/util/config_file.c index 99397d4e5..b0e9b275d 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -113,6 +113,7 @@ config_create() cfg->harden_short_bufsize = 0; cfg->harden_large_queries = 0; cfg->harden_glue = 1; + cfg->harden_dnssec_stripped = 1; cfg->hide_identity = 0; cfg->hide_version = 0; cfg->identity = NULL; diff --git a/util/config_file.h b/util/config_file.h index bcedf9ecc..3eb0faf5d 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -129,6 +129,8 @@ struct config_file { int harden_large_queries; /** harden against spoofed glue (out of zone data) */ int harden_glue; + /** harden against receiving no DNSSEC data for trust anchor */ + int harden_dnssec_stripped; /** chrootdir, if not "" or chroot will be done */ char* chrootdir; diff --git a/util/configlexer.c b/util/configlexer.c index 979d880d6..37160e656 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -365,8 +365,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 78 -#define YY_END_OF_BUFFER 79 +#define YY_NUM_RULES 79 +#define YY_END_OF_BUFFER 80 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -374,82 +374,85 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[678] = +static yyconst flex_int16_t yy_accept[694] = { 0, - 1, 1, 66, 66, 70, 70, 74, 74, 79, 77, - 1, 64, 65, 2, 78, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 66, 67, 78, 68, 78, 73, 70, 71, 72, - 78, 74, 75, 76, 78, 77, 0, 1, 2, 2, - 2, 2, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 66, - 0, 73, 0, 70, 74, 0, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 40, 77, 77, 77, 77, 6, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 17, 77, 11, 12, - 77, 14, 13, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 3, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 69, 77, 77, 77, 77, 77, 77, 20, 77, - - 77, 77, 77, 77, 77, 21, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 51, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 50, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 18, 77, 77, 77, - 77, 77, 77, 77, 19, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 15, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 41, 42, 39, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 5, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 22, 77, - 77, 77, 77, 63, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 38, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 4, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 44, 45, 43, 77, - 77, 77, 49, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - - 77, 77, 77, 55, 77, 77, 77, 77, 77, 77, - 28, 77, 77, 77, 77, 48, 77, 77, 77, 77, - 77, 77, 77, 77, 52, 77, 77, 77, 77, 77, - 77, 7, 77, 77, 77, 77, 77, 77, 57, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 29, 30, 60, 77, 77, 24, 77, 77, 77, - 77, 8, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 61, - 23, 25, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 10, 77, - - 77, 77, 77, 77, 9, 26, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 31, 77, 77, 27, 77, 53, 54, 77, 77, 56, - 77, 77, 77, 77, 77, 77, 77, 77, 16, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 35, 77, 77, 59, 46, 77, 37, 36, 77, 32, - 77, 58, 77, 77, 33, 77, 77, 47, 34, 77, - 77, 77, 77, 77, 77, 62, 0 + 1, 1, 67, 67, 71, 71, 75, 75, 80, 78, + 1, 65, 66, 2, 79, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 67, 68, 79, 69, 79, 74, 71, 72, 73, + 79, 75, 76, 77, 79, 78, 0, 1, 2, 2, + 2, 2, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 67, + 0, 74, 0, 71, 75, 0, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 41, 78, 78, 78, 78, 6, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 17, 78, 11, 12, + 78, 14, 13, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 3, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 70, 78, 78, 78, 78, 78, 78, 20, + + 78, 78, 78, 78, 78, 78, 21, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 52, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 51, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 18, 78, + 78, 78, 78, 78, 78, 78, 19, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 15, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 42, 43, 40, 78, 78, 78, + + 78, 78, 78, 78, 78, 78, 5, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 22, 78, 78, 78, 78, 64, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 38, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 4, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 45, 46, 44, 78, 78, 78, 78, 50, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + + 78, 78, 78, 78, 78, 78, 78, 78, 78, 56, + 78, 78, 78, 78, 78, 78, 28, 78, 78, 78, + 78, 78, 49, 78, 78, 78, 78, 78, 78, 78, + 78, 53, 78, 78, 78, 78, 78, 78, 7, 78, + 78, 78, 78, 78, 78, 58, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 29, + 30, 61, 78, 78, 24, 78, 78, 78, 78, 8, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 62, 23, + 25, 78, 78, 78, 78, 78, 78, 78, 78, 78, + + 78, 78, 78, 78, 78, 78, 78, 78, 10, 78, + 78, 78, 78, 78, 9, 26, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 31, 78, 78, 27, 78, 54, 55, 78, 78, + 57, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 16, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 35, 78, 78, 60, 47, 78, 78, + 37, 36, 78, 32, 78, 59, 78, 78, 78, 33, + 78, 78, 48, 39, 34, 78, 78, 78, 78, 78, + 78, 63, 0 + } ; static yyconst flex_int32_t yy_ec[256] = @@ -492,17 +495,17 @@ static yyconst flex_int32_t yy_meta[38] = 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[687] = +static yyconst flex_int16_t yy_base[703] = { 0, - 0, 0, 35, 38, 49, 53, 59, 63, 1380, 1367, - 42, 1381, 1381, 68, 72, 66, 69, 33, 70, 72, + 0, 0, 35, 38, 49, 53, 59, 63, 1412, 1399, + 42, 1413, 1413, 68, 72, 66, 69, 33, 70, 72, 75, 34, 73, 81, 37, 84, 86, 89, 95, 88, - 104, 1366, 1381, 1381, 1381, 118, 1365, 1374, 1381, 1381, - 123, 1363, 1381, 1381, 125, 1362, 129, 130, 0, 133, + 104, 1398, 1413, 1413, 1413, 118, 1397, 1406, 1413, 1413, + 123, 1395, 1413, 1413, 125, 1394, 129, 130, 0, 133, 0, 0, 99, 90, 97, 132, 128, 129, 130, 131, 135, 137, 140, 139, 142, 144, 148, 150, 151, 153, - 152, 157, 159, 158, 162, 163, 167, 171, 164, 1361, - 181, 1360, 194, 1369, 1358, 196, 177, 180, 190, 191, + 152, 157, 159, 158, 162, 163, 167, 171, 164, 1393, + 181, 1392, 194, 1401, 1390, 196, 177, 180, 190, 191, 192, 193, 196, 199, 202, 198, 203, 222, 218, 205, 226, 223, 232, 229, 231, 219, 220, 230, 233, 207, @@ -512,145 +515,151 @@ static yyconst flex_int16_t yy_base[687] = 299, 300, 306, 302, 304, 308, 309, 327, 310, 311, 317, 313, 314, 337, 319, 316, 321, 328, 339, 344, 346, 343, 348, 354, 350, 358, 351, 361, 360, 363, - 1357, 367, 368, 369, 370, 1356, 371, 377, 373, 374, + 1389, 367, 368, 369, 370, 1388, 371, 377, 373, 374, 383, 389, 385, 391, 386, 393, 388, 395, 396, 397, 398, 405, 408, 410, 414, 419, 425, 422, 427, 428, 434, 431, 433, 411, 436, 437, 440, 444, 439, 447, 454, 453, 455, 456, 446, 457, 460, 462, 464, 469, 472, 466, 473, 479, 477, 481, 475, 482, 483, 484, - 486, 492, 488, 495, 496, 498, 1355, 500, 1354, 1353, - 502, 1352, 1351, 506, 503, 507, 508, 511, 516, 513, - 522, 519, 526, 528, 524, 530, 534, 536, 538, 539, - 540, 541, 544, 547, 549, 1350, 551, 552, 553, 557, - 554, 564, 558, 568, 403, 561, 571, 565, 572, 575, - 577, 578, 579, 580, 585, 581, 587, 583, 589, 590, - 596, 1349, 604, 606, 597, 605, 607, 611, 1348, 613, - - 614, 618, 620, 621, 630, 1347, 624, 628, 632, 626, - 633, 634, 637, 315, 636, 642, 635, 644, 651, 646, - 652, 648, 1346, 659, 656, 660, 658, 664, 666, 667, - 668, 669, 670, 673, 1345, 671, 686, 674, 676, 691, - 697, 675, 679, 700, 698, 701, 699, 702, 707, 710, - 718, 722, 704, 711, 724, 706, 1344, 730, 731, 732, - 728, 733, 735, 736, 1343, 739, 738, 740, 741, 743, - 745, 744, 750, 746, 747, 757, 768, 769, 1342, 753, - 766, 770, 773, 774, 775, 776, 777, 780, 778, 782, - 783, 1341, 1340, 1339, 784, 785, 786, 796, 790, 800, - - 798, 802, 803, 1338, 804, 805, 807, 811, 812, 814, - 815, 816, 818, 819, 822, 831, 825, 827, 836, 833, - 838, 839, 854, 841, 843, 851, 852, 853, 1337, 860, - 857, 858, 859, 1336, 861, 864, 867, 871, 870, 873, - 883, 882, 886, 888, 1335, 894, 895, 874, 892, 901, - 893, 897, 899, 900, 902, 905, 908, 907, 909, 913, - 1334, 914, 920, 921, 922, 923, 931, 935, 938, 936, - 939, 924, 942, 944, 946, 949, 1333, 1332, 1331, 951, - 952, 956, 1330, 953, 957, 959, 962, 963, 964, 961, - 968, 977, 969, 978, 980, 981, 971, 984, 990, 987, - - 991, 993, 995, 1329, 998, 997, 1005, 999, 1006, 1007, - 1328, 1009, 1011, 1015, 1016, 1327, 1018, 1019, 1020, 1022, - 1027, 1029, 1034, 1024, 1326, 1038, 1040, 1030, 1037, 1041, - 1046, 1325, 1045, 1050, 1051, 1053, 1055, 1056, 1324, 1057, - 1059, 1060, 1063, 1062, 1069, 1073, 1071, 1070, 1074, 1080, - 1081, 1323, 1322, 1321, 1087, 1090, 1320, 1092, 1098, 1094, - 1082, 1319, 1096, 1100, 1099, 1103, 1104, 1107, 1084, 1105, - 1106, 1108, 1111, 1113, 1117, 1120, 1126, 1122, 1123, 1318, - 1317, 1316, 1127, 1128, 1133, 1138, 1129, 1134, 1139, 1140, - 1142, 1148, 1149, 1150, 1152, 1151, 1158, 1159, 1315, 1155, - - 1160, 1166, 1161, 1170, 1314, 1313, 1172, 1174, 1180, 1182, - 1163, 1188, 1185, 1186, 1187, 1189, 1191, 1192, 1193, 1194, - 1312, 1195, 1199, 1311, 1200, 1309, 1301, 1203, 1201, 1285, - 1206, 1207, 1208, 1209, 1214, 1215, 1216, 1218, 1283, 1221, - 1226, 1228, 1230, 1232, 1233, 1236, 1239, 1241, 1243, 1244, - 1280, 1249, 1250, 1279, 1278, 1252, 1277, 1276, 1254, 1270, - 1256, 985, 1257, 1259, 927, 1262, 1263, 828, 749, 1265, - 1266, 1267, 1269, 1268, 1273, 677, 1381, 1298, 1302, 1306, - 609, 1310, 1314, 217, 1316, 1318 + 486, 492, 488, 495, 496, 498, 1387, 500, 1386, 1385, + 502, 1384, 1383, 506, 503, 508, 511, 512, 516, 519, + 522, 520, 524, 527, 529, 532, 535, 533, 540, 541, + 542, 543, 545, 546, 551, 1382, 549, 554, 555, 556, + 557, 565, 563, 561, 403, 575, 564, 569, 571, 573, + 578, 579, 580, 581, 587, 584, 582, 589, 591, 585, + 596, 606, 1381, 608, 607, 600, 609, 611, 615, 1380, + + 613, 617, 619, 623, 625, 633, 1379, 629, 631, 630, + 635, 636, 637, 640, 315, 638, 645, 639, 646, 653, + 650, 651, 655, 1378, 661, 663, 664, 666, 658, 668, + 665, 671, 673, 674, 675, 676, 1377, 680, 678, 677, + 684, 698, 692, 695, 699, 705, 701, 703, 702, 704, + 710, 713, 721, 724, 709, 725, 726, 727, 1376, 735, + 737, 741, 729, 739, 743, 740, 1375, 744, 745, 746, + 747, 748, 750, 751, 752, 753, 754, 756, 765, 772, + 778, 1374, 763, 771, 779, 775, 780, 782, 783, 784, + 785, 786, 789, 790, 1373, 1372, 1371, 791, 792, 797, + + 802, 803, 807, 805, 809, 810, 1370, 811, 812, 814, + 816, 818, 819, 826, 827, 820, 829, 833, 837, 843, + 834, 840, 841, 842, 844, 845, 860, 858, 847, 861, + 863, 864, 1369, 870, 867, 868, 869, 1368, 871, 872, + 874, 878, 882, 881, 889, 894, 896, 898, 899, 1367, + 905, 906, 886, 904, 912, 908, 909, 911, 888, 914, + 916, 918, 917, 924, 920, 1366, 929, 936, 922, 932, + 933, 943, 945, 952, 937, 946, 949, 958, 954, 956, + 959, 1365, 1364, 1363, 962, 961, 963, 967, 1362, 964, + 968, 971, 974, 976, 978, 979, 980, 993, 972, 981, + + 988, 994, 995, 996, 1001, 998, 1002, 1004, 1008, 1361, + 1010, 1006, 1009, 1007, 1017, 1022, 1360, 1020, 1023, 1026, + 1028, 1029, 1359, 1030, 1031, 1034, 1035, 1039, 1041, 1051, + 1042, 1358, 1047, 1054, 1045, 1055, 1056, 1058, 1357, 1065, + 1032, 1066, 1059, 1068, 1069, 1356, 1070, 1071, 1074, 1081, + 1079, 1082, 1084, 1086, 1087, 1090, 1092, 1088, 1098, 1355, + 1354, 1353, 1095, 1102, 1352, 1107, 1104, 1108, 1110, 1351, + 1111, 1112, 1113, 1115, 1117, 1118, 1119, 1120, 1121, 1123, + 1129, 1131, 1132, 1134, 1136, 1142, 1141, 1138, 1350, 1349, + 1348, 1143, 1147, 1146, 1154, 1151, 1157, 1158, 1159, 1160, + + 1165, 1167, 1161, 1168, 1171, 1176, 1177, 1178, 1347, 1179, + 1180, 1184, 1181, 1188, 1346, 1345, 1191, 1192, 1200, 1202, + 1194, 1208, 1205, 1206, 1196, 1209, 1211, 1213, 1212, 1215, + 1216, 1344, 1219, 1221, 1342, 1222, 1334, 1318, 1227, 1223, + 1317, 1225, 1229, 1231, 1233, 1234, 1238, 1239, 1240, 1244, + 1316, 1242, 1250, 1251, 1254, 1256, 1257, 1260, 1263, 1267, + 1268, 1272, 1276, 1315, 1279, 1269, 1314, 1312, 1280, 1281, + 1310, 1309, 1283, 1308, 1284, 1302, 1286, 1290, 1292, 1259, + 1294, 1295, 1122, 817, 714, 1287, 1298, 1297, 1300, 1301, + 1305, 681, 1413, 1331, 1335, 1339, 605, 1343, 1347, 217, + + 1349, 1351 } ; -static yyconst flex_int16_t yy_def[687] = +static yyconst flex_int16_t yy_def[703] = { 0, - 677, 1, 678, 678, 679, 679, 680, 680, 677, 681, - 677, 677, 677, 682, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 683, 677, 677, 677, 683, 684, 677, 677, 677, - 684, 685, 677, 677, 685, 681, 681, 677, 686, 682, - 686, 682, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 683, - 683, 684, 684, 677, 685, 685, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 681, 681, 681, 681, - 681, 681, 681, 681, 681, 681, 0, 677, 677, 677, - 677, 677, 677, 677, 677, 677 + 693, 1, 694, 694, 695, 695, 696, 696, 693, 697, + 693, 693, 693, 698, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 699, 693, 693, 693, 699, 700, 693, 693, 693, + 700, 701, 693, 693, 701, 697, 697, 693, 702, 698, + 702, 698, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 699, + 699, 700, 700, 693, 701, 701, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 697, 697, 697, 697, 697, 697, 697, 697, + 697, 697, 0, 693, 693, 693, 693, 693, 693, 693, + + 693, 693 } ; -static yyconst flex_int16_t yy_nxt[1419] = +static yyconst flex_int16_t yy_nxt[1451] = { 0, 10, 11, 12, 12, 13, 14, 10, 10, 10, 10, 10, 15, 10, 10, 16, 17, 10, 18, 10, 19, @@ -688,7 +697,7 @@ static yyconst flex_int16_t yy_nxt[1419] = 168, 171, 47, 172, 174, 175, 173, 176, 47, 177, 47, 47, 180, 47, 47, 47, 179, 47, 181, 47, 47, 47, 47, 192, 47, 47, 47, 47, 47, 178, - 47, 191, 47, 184, 182, 190, 355, 183, 47, 47, + 47, 191, 47, 184, 182, 190, 357, 183, 47, 47, 185, 186, 198, 193, 194, 195, 196, 199, 47, 197, 47, 187, 188, 189, 47, 47, 200, 47, 205, 47, 207, 47, 47, 201, 202, 47, 204, 208, 206, 47, @@ -699,7 +708,7 @@ static yyconst flex_int16_t yy_nxt[1419] = 47, 220, 47, 228, 47, 226, 47, 47, 47, 47, 223, 229, 233, 224, 47, 230, 47, 231, 237, 47, 227, 47, 47, 235, 239, 47, 234, 232, 236, 240, - 47, 241, 242, 47, 317, 238, 47, 243, 47, 47, + 47, 241, 242, 47, 318, 238, 47, 243, 47, 47, 245, 248, 47, 244, 47, 47, 246, 47, 47, 247, 47, 47, 249, 255, 251, 47, 254, 47, 47, 252, 257, 250, 253, 256, 47, 47, 47, 47, 47, 259, @@ -708,109 +717,112 @@ static yyconst flex_int16_t yy_nxt[1419] = 47, 268, 47, 47, 47, 47, 272, 47, 269, 47, 276, 275, 277, 47, 273, 274, 47, 47, 278, 47, - 282, 47, 285, 47, 47, 280, 279, 47, 47, 47, - 281, 286, 47, 289, 47, 287, 292, 47, 283, 284, - 47, 293, 288, 47, 294, 47, 290, 47, 296, 47, - 299, 47, 297, 298, 295, 47, 291, 47, 300, 47, - 47, 47, 47, 301, 306, 47, 304, 302, 47, 305, - 47, 308, 47, 47, 47, 47, 309, 303, 47, 47, - 314, 307, 47, 318, 312, 47, 47, 311, 313, 47, - 315, 310, 47, 47, 316, 319, 47, 323, 47, 47, - 47, 47, 47, 320, 47, 321, 47, 327, 47, 331, - - 47, 47, 332, 330, 328, 322, 335, 47, 47, 46, - 336, 326, 324, 333, 325, 47, 47, 47, 47, 334, - 337, 329, 47, 340, 47, 47, 338, 341, 339, 47, - 343, 47, 47, 346, 344, 47, 347, 47, 342, 47, - 345, 47, 349, 47, 47, 47, 47, 47, 47, 352, - 353, 354, 357, 47, 348, 47, 351, 47, 360, 47, - 350, 356, 47, 47, 358, 364, 365, 47, 359, 47, - 47, 47, 362, 367, 361, 47, 366, 47, 47, 47, - 47, 47, 47, 363, 47, 47, 47, 47, 47, 368, - 47, 369, 378, 374, 372, 375, 371, 47, 370, 381, - - 373, 379, 47, 380, 377, 376, 383, 382, 47, 47, - 47, 47, 47, 47, 384, 47, 385, 47, 47, 386, - 392, 47, 47, 387, 398, 388, 391, 389, 393, 47, - 396, 390, 394, 47, 395, 47, 399, 400, 401, 47, - 397, 47, 47, 47, 47, 404, 47, 47, 402, 47, - 47, 47, 47, 407, 47, 47, 47, 47, 47, 410, - 47, 47, 403, 411, 47, 409, 405, 406, 47, 408, - 413, 414, 412, 416, 417, 418, 421, 47, 415, 47, - 47, 47, 419, 420, 47, 47, 47, 47, 47, 47, - 428, 47, 429, 47, 47, 47, 47, 47, 431, 430, - - 425, 47, 422, 423, 424, 427, 434, 47, 426, 47, - 432, 47, 436, 47, 47, 47, 47, 438, 47, 437, - 435, 433, 47, 47, 445, 47, 47, 47, 444, 47, - 47, 446, 439, 47, 440, 442, 47, 451, 47, 47, - 441, 443, 47, 449, 47, 450, 447, 47, 448, 47, - 47, 461, 47, 456, 47, 452, 454, 453, 455, 458, - 460, 459, 47, 47, 47, 47, 466, 457, 47, 47, - 47, 47, 47, 462, 463, 47, 467, 465, 47, 471, - 464, 47, 47, 472, 47, 47, 468, 473, 469, 476, - 474, 470, 477, 47, 47, 475, 478, 47, 479, 47, - - 480, 481, 483, 47, 47, 47, 47, 484, 47, 482, - 47, 47, 47, 47, 491, 485, 47, 486, 47, 47, - 47, 495, 487, 492, 47, 47, 498, 488, 493, 489, - 497, 47, 47, 47, 47, 47, 490, 502, 47, 496, - 500, 503, 47, 494, 505, 504, 47, 47, 509, 47, - 47, 499, 501, 47, 507, 47, 511, 47, 506, 508, - 47, 512, 47, 47, 47, 515, 516, 47, 47, 518, - 47, 513, 47, 47, 47, 47, 510, 523, 514, 47, - 47, 524, 47, 517, 520, 521, 522, 525, 47, 47, - 519, 47, 47, 528, 527, 47, 47, 529, 47, 530, - - 532, 47, 47, 533, 47, 526, 47, 539, 47, 47, - 47, 534, 537, 535, 531, 538, 47, 47, 47, 536, - 47, 542, 47, 543, 544, 540, 47, 47, 541, 47, - 47, 47, 548, 47, 551, 47, 545, 552, 47, 553, - 47, 47, 549, 550, 554, 47, 546, 547, 47, 47, - 557, 47, 47, 555, 556, 562, 47, 47, 560, 558, - 561, 47, 47, 564, 47, 559, 47, 47, 47, 571, - 47, 47, 570, 47, 47, 566, 567, 572, 565, 569, - 47, 47, 47, 573, 47, 47, 563, 568, 575, 574, - 577, 47, 47, 47, 579, 47, 576, 580, 47, 578, - - 581, 47, 582, 47, 583, 47, 584, 47, 585, 47, - 47, 47, 586, 587, 47, 47, 47, 47, 47, 47, - 592, 588, 47, 596, 47, 589, 590, 591, 47, 594, - 599, 47, 600, 47, 47, 593, 595, 47, 47, 47, - 47, 597, 604, 605, 47, 47, 598, 601, 606, 47, - 47, 47, 602, 47, 608, 609, 610, 603, 607, 47, - 47, 47, 47, 47, 612, 613, 47, 611, 615, 47, - 47, 47, 47, 616, 47, 614, 621, 47, 617, 618, - 622, 47, 624, 47, 619, 47, 623, 628, 625, 620, - 626, 47, 627, 47, 629, 630, 47, 47, 47, 47, - - 47, 631, 47, 47, 47, 47, 47, 634, 633, 639, - 47, 47, 47, 636, 47, 641, 632, 47, 47, 47, - 47, 642, 643, 638, 637, 47, 47, 47, 635, 47, - 647, 651, 47, 645, 650, 640, 644, 47, 646, 47, - 654, 47, 655, 47, 47, 649, 657, 47, 652, 658, - 47, 648, 47, 660, 47, 47, 661, 659, 653, 662, - 47, 47, 656, 47, 665, 47, 663, 47, 47, 668, - 47, 666, 669, 47, 47, 670, 47, 47, 47, 47, - 47, 47, 664, 676, 47, 667, 672, 47, 47, 47, - 47, 47, 673, 674, 47, 671, 47, 675, 32, 32, - - 32, 32, 37, 37, 37, 37, 42, 42, 42, 42, - 50, 50, 47, 50, 80, 80, 85, 85, 51, 51, - 47, 51, 47, 47, 47, 47, 47, 47, 47, 47, + 282, 47, 285, 47, 47, 280, 279, 47, 286, 47, + 281, 287, 47, 47, 290, 288, 293, 47, 283, 284, + 47, 47, 289, 47, 295, 47, 297, 294, 47, 291, + 47, 298, 300, 47, 47, 296, 47, 292, 299, 301, + 302, 47, 47, 47, 47, 307, 47, 47, 305, 303, + 47, 306, 47, 309, 310, 47, 47, 47, 47, 304, + 308, 315, 47, 313, 47, 47, 47, 317, 320, 312, + 47, 314, 47, 311, 47, 316, 47, 319, 324, 47, + 47, 47, 47, 47, 322, 47, 47, 321, 47, 328, + + 47, 333, 47, 323, 332, 46, 329, 47, 331, 335, + 334, 47, 327, 325, 338, 326, 337, 47, 47, 47, + 47, 339, 47, 330, 47, 336, 47, 342, 47, 340, + 47, 343, 341, 345, 47, 346, 47, 348, 344, 349, + 47, 47, 47, 347, 47, 351, 47, 47, 47, 47, + 47, 47, 354, 355, 356, 359, 47, 47, 352, 350, + 362, 47, 47, 358, 47, 353, 47, 366, 360, 47, + 361, 364, 47, 367, 47, 47, 47, 47, 363, 47, + 368, 369, 47, 370, 47, 47, 47, 47, 47, 47, + 365, 47, 47, 371, 372, 47, 377, 379, 383, 375, + + 381, 374, 373, 47, 378, 376, 47, 380, 382, 47, + 47, 386, 47, 47, 47, 47, 47, 387, 388, 384, + 47, 47, 389, 395, 47, 47, 390, 385, 391, 394, + 392, 396, 47, 393, 397, 47, 47, 47, 47, 398, + 47, 402, 400, 403, 399, 401, 47, 404, 47, 405, + 47, 47, 47, 407, 47, 47, 47, 47, 47, 47, + 410, 47, 47, 47, 47, 47, 414, 47, 406, 415, + 408, 412, 409, 417, 47, 411, 47, 413, 421, 418, + 416, 420, 47, 47, 422, 425, 47, 419, 424, 47, + 47, 47, 423, 47, 47, 47, 47, 47, 432, 433, + + 47, 47, 47, 47, 426, 435, 434, 429, 47, 427, + 431, 428, 438, 47, 47, 430, 47, 436, 47, 440, + 47, 47, 47, 47, 442, 47, 441, 47, 47, 47, + 47, 47, 437, 439, 448, 449, 450, 47, 47, 443, + 47, 444, 446, 451, 47, 47, 447, 445, 47, 456, + 452, 47, 47, 47, 47, 47, 47, 454, 47, 453, + 455, 459, 461, 460, 457, 463, 465, 464, 466, 47, + 458, 47, 47, 462, 47, 47, 471, 467, 47, 47, + 47, 47, 47, 47, 468, 47, 472, 476, 470, 47, + 477, 469, 47, 47, 478, 481, 473, 47, 474, 47, + + 47, 475, 479, 480, 482, 47, 483, 47, 484, 47, + 47, 486, 487, 485, 489, 47, 47, 47, 490, 47, + 47, 488, 47, 47, 496, 47, 497, 47, 47, 47, + 491, 47, 492, 47, 498, 47, 501, 493, 499, 494, + 47, 495, 504, 47, 47, 503, 502, 47, 47, 508, + 506, 509, 505, 500, 47, 510, 47, 47, 511, 512, + 47, 513, 507, 47, 515, 47, 517, 47, 520, 47, + 47, 518, 47, 47, 47, 47, 522, 523, 47, 47, + 525, 519, 47, 47, 514, 47, 516, 47, 521, 47, + 47, 47, 47, 531, 524, 530, 527, 534, 528, 47, + + 529, 535, 526, 532, 47, 47, 47, 47, 533, 47, + 536, 539, 47, 47, 540, 47, 546, 47, 47, 47, + 47, 47, 541, 537, 542, 544, 538, 545, 47, 547, + 543, 47, 549, 47, 47, 551, 548, 47, 550, 47, + 47, 47, 47, 47, 556, 47, 47, 559, 552, 560, + 47, 561, 47, 47, 557, 553, 47, 558, 47, 554, + 555, 562, 47, 564, 565, 47, 47, 47, 571, 47, + 47, 563, 569, 568, 566, 570, 47, 47, 572, 47, + 47, 47, 47, 567, 573, 47, 578, 579, 574, 575, + 47, 577, 47, 47, 580, 47, 581, 47, 47, 47, + + 576, 47, 583, 47, 584, 589, 47, 587, 586, 47, + 592, 588, 590, 47, 582, 47, 585, 591, 47, 47, + 593, 47, 47, 47, 47, 596, 47, 595, 47, 47, + 47, 47, 47, 47, 47, 597, 594, 598, 600, 599, + 47, 605, 47, 47, 603, 47, 609, 47, 610, 47, + 602, 604, 47, 47, 47, 601, 615, 47, 47, 606, + 607, 614, 47, 608, 616, 47, 611, 612, 47, 47, + 47, 47, 47, 613, 619, 620, 47, 618, 47, 47, + 617, 622, 47, 623, 625, 621, 624, 47, 47, 47, + 47, 47, 47, 626, 632, 47, 627, 628, 629, 47, + + 633, 635, 47, 47, 634, 47, 636, 47, 630, 631, + 637, 47, 638, 47, 640, 641, 47, 47, 639, 47, + 47, 642, 47, 47, 47, 643, 47, 47, 644, 646, + 47, 651, 47, 47, 47, 648, 47, 645, 47, 653, + 47, 655, 47, 654, 47, 47, 649, 650, 647, 47, + 47, 47, 664, 47, 660, 47, 657, 652, 656, 658, + 663, 47, 47, 659, 667, 47, 668, 47, 47, 662, + 47, 47, 665, 671, 47, 661, 670, 672, 47, 47, + 47, 666, 674, 47, 673, 677, 669, 47, 675, 676, + 47, 47, 47, 680, 47, 47, 679, 47, 47, 681, + + 683, 47, 684, 47, 685, 47, 47, 686, 47, 47, + 678, 47, 47, 47, 682, 692, 47, 687, 688, 47, + 47, 47, 689, 47, 690, 47, 47, 47, 47, 47, + 691, 32, 32, 32, 32, 37, 37, 37, 37, 42, + 42, 42, 42, 50, 50, 47, 50, 80, 80, 85, + 85, 51, 51, 47, 51, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 47, 47, 47, 47, 47, 86, - 84, 83, 81, 47, 86, 84, 83, 81, 47, 677, - 9, 677, 677, 677, 677, 677, 677, 677, 677, 677, - 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - 677, 677, 677, 677, 677, 677, 677, 677 + 47, 86, 84, 83, 81, 47, 86, 84, 83, 81, + 47, 693, 9, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693 } ; -static yyconst flex_int16_t yy_chk[1419] = +static yyconst flex_int16_t yy_chk[1451] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -835,7 +847,7 @@ static yyconst flex_int16_t yy_chk[1419] = 75, 88, 79, 78, 76, 83, 87, 83, 83, 86, 86, 89, 90, 91, 92, 88, 89, 93, 92, 96, - 94, 90, 93, 95, 97, 90, 100, 684, 110, 97, + 94, 90, 93, 95, 97, 90, 100, 700, 110, 97, 110, 90, 90, 94, 95, 91, 96, 95, 98, 99, 106, 107, 101, 98, 102, 99, 100, 101, 103, 102, 104, 108, 105, 103, 109, 111, 108, 104, 105, 106, @@ -847,8 +859,8 @@ static yyconst flex_int16_t yy_chk[1419] = 133, 135, 135, 136, 137, 138, 136, 139, 139, 140, 141, 142, 143, 144, 140, 145, 142, 143, 144, 146, - 147, 149, 150, 151, 152, 153, 314, 156, 151, 141, - 155, 150, 157, 147, 145, 149, 314, 146, 148, 158, + 147, 149, 150, 151, 152, 153, 315, 156, 151, 141, + 155, 150, 157, 147, 145, 149, 315, 146, 148, 158, 148, 148, 156, 152, 153, 154, 154, 157, 154, 155, 159, 148, 148, 148, 162, 160, 158, 161, 162, 163, 164, 165, 167, 159, 160, 164, 161, 165, 163, 166, @@ -868,106 +880,109 @@ static yyconst flex_int16_t yy_chk[1419] = 224, 222, 226, 228, 229, 230, 226, 231, 223, 233, 230, 229, 231, 232, 227, 228, 234, 235, 232, 236, - 236, 238, 244, 241, 245, 234, 233, 244, 246, 247, - 235, 245, 248, 246, 250, 245, 249, 249, 238, 241, - 252, 250, 245, 251, 251, 255, 247, 253, 253, 254, - 256, 256, 254, 255, 252, 257, 248, 258, 257, 259, - 260, 261, 262, 258, 263, 263, 261, 259, 264, 262, - 265, 265, 267, 268, 269, 271, 267, 260, 270, 273, - 272, 264, 276, 276, 270, 272, 278, 269, 271, 274, - 273, 268, 277, 279, 274, 277, 280, 281, 281, 282, - 283, 284, 286, 278, 288, 279, 285, 285, 287, 287, - - 289, 290, 288, 286, 285, 280, 291, 291, 295, 681, - 293, 284, 282, 289, 283, 293, 296, 294, 297, 290, - 294, 285, 298, 297, 300, 301, 295, 298, 296, 302, - 301, 303, 304, 304, 302, 307, 305, 310, 300, 308, - 303, 305, 308, 309, 311, 312, 317, 315, 313, 311, - 312, 313, 316, 316, 307, 318, 310, 320, 319, 322, - 309, 315, 319, 321, 317, 324, 325, 325, 318, 327, - 324, 326, 321, 327, 320, 328, 326, 329, 330, 331, - 332, 333, 336, 322, 334, 338, 342, 339, 676, 328, - 343, 329, 339, 334, 332, 336, 331, 337, 330, 342, - - 333, 340, 340, 341, 338, 337, 344, 343, 341, 345, - 347, 344, 346, 348, 345, 353, 346, 356, 349, 347, - 350, 350, 354, 347, 356, 347, 349, 347, 351, 351, - 354, 348, 352, 352, 353, 355, 358, 359, 360, 361, - 355, 358, 359, 360, 362, 363, 363, 364, 361, 367, - 366, 368, 369, 367, 370, 372, 371, 374, 375, 370, - 669, 373, 362, 371, 380, 369, 364, 366, 376, 368, - 373, 374, 372, 376, 377, 378, 382, 381, 375, 377, - 378, 382, 380, 381, 383, 384, 385, 386, 387, 389, - 389, 388, 390, 390, 391, 395, 396, 397, 395, 391, - - 386, 399, 383, 384, 385, 388, 398, 398, 387, 401, - 396, 400, 400, 402, 403, 405, 406, 402, 407, 401, - 399, 397, 408, 409, 410, 410, 411, 412, 409, 413, - 414, 411, 403, 415, 405, 407, 417, 416, 418, 668, - 406, 408, 416, 414, 420, 415, 412, 419, 413, 421, - 422, 424, 424, 420, 425, 417, 419, 418, 419, 422, - 423, 422, 426, 427, 428, 423, 430, 421, 431, 432, - 433, 430, 435, 425, 426, 436, 431, 428, 437, 436, - 427, 439, 438, 437, 440, 448, 432, 438, 433, 441, - 439, 435, 442, 442, 441, 440, 443, 443, 444, 444, - - 446, 447, 449, 449, 451, 446, 447, 450, 452, 448, - 453, 454, 450, 455, 455, 451, 456, 451, 458, 457, - 459, 459, 451, 456, 460, 462, 463, 452, 457, 453, - 462, 463, 464, 465, 466, 472, 454, 467, 665, 460, - 465, 468, 467, 458, 469, 468, 468, 470, 473, 469, - 471, 464, 466, 473, 471, 474, 475, 475, 470, 472, - 476, 476, 480, 481, 484, 481, 482, 482, 485, 485, - 486, 476, 490, 487, 488, 489, 474, 490, 480, 491, - 493, 491, 497, 484, 487, 488, 489, 492, 492, 494, - 486, 495, 496, 495, 494, 498, 662, 496, 500, 497, - - 499, 499, 501, 500, 502, 493, 503, 506, 506, 505, - 508, 501, 503, 501, 498, 505, 507, 509, 510, 502, - 512, 509, 513, 510, 512, 507, 514, 515, 508, 517, - 518, 519, 517, 520, 520, 524, 513, 521, 521, 522, - 522, 528, 518, 519, 523, 523, 514, 515, 529, 526, - 527, 527, 530, 524, 526, 533, 533, 531, 530, 528, - 531, 534, 535, 535, 536, 529, 537, 538, 540, 543, - 541, 542, 542, 544, 543, 537, 538, 544, 536, 541, - 545, 548, 547, 545, 546, 549, 534, 540, 547, 546, - 549, 550, 551, 561, 551, 569, 548, 555, 555, 550, - - 556, 556, 558, 558, 559, 560, 560, 563, 561, 559, - 565, 564, 563, 564, 566, 567, 570, 571, 568, 572, - 569, 565, 573, 573, 574, 566, 567, 568, 575, 571, - 576, 576, 577, 578, 579, 570, 572, 577, 583, 584, - 587, 574, 584, 585, 585, 588, 575, 578, 586, 586, - 589, 590, 579, 591, 588, 589, 590, 583, 587, 592, - 593, 594, 596, 595, 592, 593, 600, 591, 595, 597, - 598, 601, 603, 596, 611, 594, 602, 602, 597, 598, - 603, 604, 607, 607, 600, 608, 604, 611, 608, 601, - 609, 609, 610, 610, 612, 613, 613, 614, 615, 612, - - 616, 614, 617, 618, 619, 620, 622, 617, 616, 623, - 623, 625, 629, 619, 628, 628, 615, 631, 632, 633, - 634, 629, 631, 622, 620, 635, 636, 637, 618, 638, - 635, 640, 640, 633, 638, 625, 632, 641, 634, 642, - 643, 643, 644, 644, 645, 637, 646, 646, 641, 647, - 647, 636, 648, 649, 649, 650, 650, 648, 642, 652, - 652, 653, 645, 656, 659, 659, 653, 661, 663, 664, - 664, 661, 666, 666, 667, 667, 670, 671, 672, 674, - 673, 660, 656, 675, 675, 663, 671, 658, 657, 655, - 654, 651, 672, 673, 639, 670, 630, 674, 678, 678, - - 678, 678, 679, 679, 679, 679, 680, 680, 680, 680, - 682, 682, 627, 682, 683, 683, 685, 685, 686, 686, - 626, 686, 624, 621, 606, 605, 599, 582, 581, 580, - 562, 557, 554, 553, 552, 539, 532, 525, 516, 511, - 504, 483, 479, 478, 477, 461, 445, 434, 429, 404, - 394, 393, 392, 379, 365, 357, 335, 323, 306, 299, - 292, 266, 243, 242, 240, 239, 237, 176, 171, 85, - 84, 82, 80, 46, 42, 38, 37, 32, 10, 9, - 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - - 677, 677, 677, 677, 677, 677, 677, 677, 677, 677, - 677, 677, 677, 677, 677, 677, 677, 677 + 236, 238, 244, 241, 245, 234, 233, 244, 245, 246, + 235, 245, 247, 248, 246, 245, 249, 249, 238, 241, + 250, 252, 245, 251, 251, 253, 253, 250, 254, 247, + 255, 254, 256, 256, 258, 252, 257, 248, 255, 257, + 258, 259, 260, 261, 262, 263, 263, 264, 261, 259, + 267, 262, 265, 265, 267, 268, 269, 270, 271, 260, + 264, 272, 274, 270, 273, 277, 272, 274, 277, 269, + 278, 271, 279, 268, 280, 273, 276, 276, 281, 281, + 282, 283, 284, 287, 279, 286, 290, 278, 285, 285, + + 288, 288, 289, 280, 287, 697, 285, 291, 286, 290, + 289, 296, 284, 282, 294, 283, 292, 292, 295, 294, + 297, 295, 298, 285, 301, 291, 299, 298, 302, 296, + 303, 299, 297, 302, 304, 303, 305, 305, 301, 306, + 308, 310, 309, 304, 306, 309, 311, 312, 313, 316, + 318, 314, 312, 313, 314, 317, 317, 319, 310, 308, + 320, 321, 322, 316, 320, 311, 323, 325, 318, 329, + 319, 322, 325, 326, 326, 327, 331, 328, 321, 330, + 327, 328, 332, 329, 333, 334, 335, 336, 340, 339, + 323, 338, 692, 330, 331, 341, 336, 339, 343, 334, + + 341, 333, 332, 343, 338, 335, 344, 340, 342, 342, + 345, 346, 347, 349, 348, 350, 346, 347, 348, 344, + 355, 351, 349, 352, 352, 685, 349, 345, 349, 351, + 349, 353, 353, 350, 354, 354, 356, 357, 358, 355, + 363, 360, 357, 361, 356, 358, 360, 362, 361, 363, + 364, 366, 362, 365, 365, 368, 369, 370, 371, 372, + 369, 373, 374, 375, 376, 377, 373, 378, 364, 374, + 366, 371, 368, 376, 383, 370, 379, 372, 380, 377, + 375, 379, 384, 380, 381, 385, 386, 378, 384, 381, + 385, 387, 383, 388, 389, 390, 391, 392, 392, 393, + + 393, 394, 398, 399, 386, 398, 394, 389, 400, 387, + 391, 388, 401, 401, 402, 390, 404, 399, 403, 403, + 405, 406, 408, 409, 405, 410, 404, 411, 684, 412, + 413, 416, 400, 402, 412, 413, 414, 414, 415, 406, + 417, 408, 410, 415, 418, 421, 411, 409, 419, 420, + 416, 422, 423, 424, 420, 425, 426, 418, 429, 417, + 419, 423, 424, 423, 421, 426, 427, 426, 428, 428, + 422, 427, 430, 425, 431, 432, 434, 429, 435, 436, + 437, 434, 439, 440, 430, 441, 435, 440, 432, 442, + 441, 431, 444, 443, 442, 445, 436, 453, 437, 459, + + 445, 439, 443, 444, 446, 446, 447, 447, 448, 448, + 449, 451, 452, 449, 454, 454, 451, 452, 455, 456, + 457, 453, 458, 455, 459, 460, 460, 461, 463, 462, + 456, 465, 456, 469, 461, 464, 464, 456, 462, 457, + 467, 458, 468, 470, 471, 467, 465, 468, 475, 472, + 470, 473, 469, 463, 472, 473, 473, 476, 474, 475, + 477, 476, 471, 474, 478, 479, 480, 480, 485, 478, + 481, 481, 486, 485, 487, 490, 487, 488, 488, 491, + 491, 481, 492, 499, 477, 493, 479, 494, 486, 495, + 496, 497, 500, 497, 490, 496, 493, 500, 494, 501, + + 495, 501, 492, 498, 498, 502, 503, 504, 499, 506, + 502, 505, 505, 507, 506, 508, 512, 512, 514, 509, + 513, 511, 507, 503, 507, 509, 504, 511, 515, 513, + 508, 518, 515, 516, 519, 518, 514, 520, 516, 521, + 522, 524, 525, 541, 524, 526, 527, 527, 519, 528, + 528, 529, 529, 531, 525, 520, 535, 526, 533, 521, + 522, 530, 530, 533, 534, 534, 536, 537, 541, 538, + 543, 531, 538, 537, 535, 540, 540, 542, 542, 544, + 545, 547, 548, 536, 543, 549, 549, 550, 544, 545, + 551, 548, 550, 552, 551, 553, 552, 554, 555, 558, + + 547, 556, 554, 557, 555, 563, 563, 558, 557, 559, + 567, 559, 564, 564, 553, 567, 556, 566, 566, 568, + 568, 569, 571, 572, 573, 572, 574, 571, 575, 576, + 577, 578, 579, 683, 580, 573, 569, 574, 576, 575, + 581, 581, 582, 583, 579, 584, 585, 585, 586, 588, + 578, 580, 587, 586, 592, 577, 594, 594, 593, 582, + 583, 593, 596, 584, 595, 595, 587, 588, 597, 598, + 599, 600, 603, 592, 598, 599, 601, 597, 602, 604, + 596, 601, 605, 602, 604, 600, 603, 606, 607, 608, + 610, 611, 613, 605, 612, 612, 606, 607, 608, 614, + + 613, 617, 617, 618, 614, 621, 618, 625, 610, 611, + 619, 619, 620, 620, 622, 623, 623, 624, 621, 622, + 626, 624, 627, 629, 628, 625, 630, 631, 626, 628, + 633, 634, 634, 636, 640, 630, 642, 627, 639, 639, + 643, 642, 644, 640, 645, 646, 631, 633, 629, 647, + 648, 649, 652, 652, 647, 650, 644, 636, 643, 645, + 650, 653, 654, 646, 655, 655, 656, 656, 657, 649, + 680, 658, 653, 659, 659, 648, 658, 660, 660, 661, + 666, 654, 662, 662, 661, 666, 657, 663, 663, 665, + 665, 669, 670, 673, 673, 675, 670, 677, 686, 675, + + 678, 678, 679, 679, 681, 681, 682, 682, 688, 687, + 669, 689, 690, 676, 677, 691, 691, 686, 687, 674, + 672, 671, 688, 668, 689, 667, 664, 651, 641, 638, + 690, 694, 694, 694, 694, 695, 695, 695, 695, 696, + 696, 696, 696, 698, 698, 637, 698, 699, 699, 701, + 701, 702, 702, 635, 702, 632, 616, 615, 609, 591, + 590, 589, 570, 565, 562, 561, 560, 546, 539, 532, + 523, 517, 510, 489, 484, 483, 482, 466, 450, 438, + 433, 407, 397, 396, 395, 382, 367, 359, 337, 324, + 307, 300, 293, 266, 243, 242, 240, 239, 237, 176, + + 171, 85, 84, 82, 80, 46, 42, 38, 37, 32, + 10, 9, 693, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693, + 693, 693, 693, 693, 693, 693, 693, 693, 693, 693 } ; static yy_state_type yy_last_accepting_state; @@ -1073,7 +1088,7 @@ static void config_end_include(void) #endif -#line 1076 "" +#line 1091 "" #define INITIAL 0 #define quotedstring 1 @@ -1229,7 +1244,7 @@ YY_DECL #line 98 "util/configlexer.lex" -#line 1232 "" +#line 1247 "" if ( !(yy_init) ) { @@ -1288,13 +1303,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 >= 678 ) + if ( yy_current_state >= 694 ) 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] != 1381 ); + while ( yy_base[yy_current_state] != 1413 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1511,161 +1526,166 @@ YY_RULE_SETUP case 39: YY_RULE_SETUP #line 137 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ZONE;} +{ YDOUT; return VAR_HARDEN_DNNSEC_STRIPPED;} YY_BREAK case 40: YY_RULE_SETUP #line 138 "util/configlexer.lex" -{ YDOUT; return VAR_NAME;} +{ YDOUT; return VAR_STUB_ZONE;} YY_BREAK case 41: YY_RULE_SETUP #line 139 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_ADDR;} +{ YDOUT; return VAR_NAME;} YY_BREAK case 42: YY_RULE_SETUP #line 140 "util/configlexer.lex" -{ YDOUT; return VAR_STUB_HOST;} +{ YDOUT; return VAR_STUB_ADDR;} YY_BREAK case 43: YY_RULE_SETUP #line 141 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ZONE;} +{ YDOUT; return VAR_STUB_HOST;} YY_BREAK case 44: YY_RULE_SETUP #line 142 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_ADDR;} +{ YDOUT; return VAR_FORWARD_ZONE;} YY_BREAK case 45: YY_RULE_SETUP #line 143 "util/configlexer.lex" -{ YDOUT; return VAR_FORWARD_HOST;} +{ YDOUT; return VAR_FORWARD_ADDR;} YY_BREAK case 46: YY_RULE_SETUP #line 144 "util/configlexer.lex" -{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} +{ YDOUT; return VAR_FORWARD_HOST;} YY_BREAK case 47: YY_RULE_SETUP #line 145 "util/configlexer.lex" -{ YDOUT; return VAR_DO_NOT_QUERY_LOCALHOST;} +{ YDOUT; return VAR_DO_NOT_QUERY_ADDRESS;} YY_BREAK case 48: YY_RULE_SETUP #line 146 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_IDENTITY;} +{ YDOUT; return VAR_DO_NOT_QUERY_LOCALHOST;} YY_BREAK case 49: YY_RULE_SETUP #line 147 "util/configlexer.lex" -{ YDOUT; return VAR_HIDE_VERSION;} +{ YDOUT; return VAR_HIDE_IDENTITY;} YY_BREAK case 50: YY_RULE_SETUP #line 148 "util/configlexer.lex" -{ YDOUT; return VAR_IDENTITY;} +{ YDOUT; return VAR_HIDE_VERSION;} YY_BREAK case 51: YY_RULE_SETUP #line 149 "util/configlexer.lex" -{ YDOUT; return VAR_VERSION;} +{ YDOUT; return VAR_IDENTITY;} YY_BREAK case 52: YY_RULE_SETUP #line 150 "util/configlexer.lex" -{ YDOUT; return VAR_MODULE_CONF;} +{ YDOUT; return VAR_VERSION;} YY_BREAK case 53: YY_RULE_SETUP #line 151 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} +{ YDOUT; return VAR_MODULE_CONF;} YY_BREAK case 54: YY_RULE_SETUP #line 152 "util/configlexer.lex" -{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} +{ YDOUT; return VAR_TRUST_ANCHOR_FILE;} YY_BREAK case 55: YY_RULE_SETUP #line 153 "util/configlexer.lex" -{ YDOUT; return VAR_TRUST_ANCHOR;} +{ YDOUT; return VAR_TRUSTED_KEYS_FILE;} YY_BREAK case 56: YY_RULE_SETUP #line 154 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} +{ YDOUT; return VAR_TRUST_ANCHOR;} YY_BREAK case 57: YY_RULE_SETUP #line 155 "util/configlexer.lex" -{ YDOUT; return VAR_BOGUS_TTL;} +{ YDOUT; return VAR_VAL_OVERRIDE_DATE;} YY_BREAK case 58: YY_RULE_SETUP #line 156 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} +{ YDOUT; return VAR_BOGUS_TTL;} YY_BREAK case 59: YY_RULE_SETUP #line 157 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} +{ YDOUT; return VAR_VAL_CLEAN_ADDITIONAL;} YY_BREAK case 60: YY_RULE_SETUP #line 158 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SIZE;} +{ YDOUT; return VAR_VAL_PERMISSIVE_MODE;} YY_BREAK case 61: YY_RULE_SETUP #line 159 "util/configlexer.lex" -{ YDOUT; return VAR_KEY_CACHE_SLABS;} +{ YDOUT; return VAR_KEY_CACHE_SIZE;} YY_BREAK case 62: YY_RULE_SETUP #line 160 "util/configlexer.lex" -{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} +{ YDOUT; return VAR_KEY_CACHE_SLABS;} YY_BREAK case 63: YY_RULE_SETUP #line 161 "util/configlexer.lex" -{ YDOUT; return VAR_USE_SYSLOG;} +{ YDOUT; return VAR_VAL_NSEC3_KEYSIZE_ITERATIONS;} YY_BREAK case 64: -/* rule 64 can match eol */ YY_RULE_SETUP #line 162 "util/configlexer.lex" +{ YDOUT; return VAR_USE_SYSLOG;} + YY_BREAK +case 65: +/* rule 65 can match eol */ +YY_RULE_SETUP +#line 163 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 65: +case 66: YY_RULE_SETUP -#line 165 "util/configlexer.lex" +#line 166 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 166 "util/configlexer.lex" +#line 167 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 66: -YY_RULE_SETUP -#line 170 "util/configlexer.lex" -{ LEXOUT(("STR(%s) ", yytext)); yymore(); } - YY_BREAK case 67: -/* rule 67 can match eol */ YY_RULE_SETUP #line 171 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK case 68: +/* rule 68 can match eol */ YY_RULE_SETUP #line 172 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 69: +YY_RULE_SETUP +#line 173 "util/configlexer.lex" { LEXOUT(("QE ")); BEGIN(INITIAL); @@ -1677,37 +1697,37 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 69: +case 70: YY_RULE_SETUP -#line 183 "util/configlexer.lex" +#line 184 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 184 "util/configlexer.lex" +#line 185 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(INITIAL); } YY_BREAK -case 70: -YY_RULE_SETUP -#line 188 "util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK case 71: -/* rule 71 can match eol */ YY_RULE_SETUP #line 189 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 72: +/* rule 72 can match eol */ YY_RULE_SETUP #line 190 "util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK case 73: YY_RULE_SETUP #line 191 "util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 74: +YY_RULE_SETUP +#line 192 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include(yytext); @@ -1715,26 +1735,26 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 196 "util/configlexer.lex" +#line 197 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(INITIAL); } YY_BREAK -case 74: -YY_RULE_SETUP -#line 200 "util/configlexer.lex" -{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } - YY_BREAK case 75: -/* rule 75 can match eol */ YY_RULE_SETUP #line 201 "util/configlexer.lex" -{ cfg_parser->line++; yymore(); } +{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK case 76: +/* rule 76 can match eol */ YY_RULE_SETUP #line 202 "util/configlexer.lex" +{ cfg_parser->line++; yymore(); } + YY_BREAK +case 77: +YY_RULE_SETUP +#line 203 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -1743,7 +1763,7 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 208 "util/configlexer.lex" +#line 209 "util/configlexer.lex" { yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ if (config_include_stack_ptr == 0) { @@ -1754,18 +1774,18 @@ case YY_STATE_EOF(INITIAL): } } YY_BREAK -case 77: +case 78: YY_RULE_SETUP -#line 218 "util/configlexer.lex" +#line 219 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); yylval.str = strdup(yytext); return STRING; } YY_BREAK -case 78: +case 79: YY_RULE_SETUP -#line 221 "util/configlexer.lex" +#line 222 "util/configlexer.lex" ECHO; YY_BREAK -#line 1768 "" +#line 1788 "" case YY_END_OF_BUFFER: { @@ -2047,7 +2067,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 >= 678 ) + if ( yy_current_state >= 694 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2075,11 +2095,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 >= 678 ) + if ( yy_current_state >= 694 ) 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 == 677); + yy_is_jam = (yy_current_state == 693); return yy_is_jam ? 0 : yy_current_state; } @@ -2712,7 +2732,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 221 "util/configlexer.lex" +#line 222 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index da01927ef..22438955e 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -134,6 +134,7 @@ target-fetch-policy{COLON} { YDOUT; return VAR_TARGET_FETCH_POLICY;} harden-short-bufsize{COLON} { YDOUT; return VAR_HARDEN_SHORT_BUFSIZE;} harden-large-queries{COLON} { YDOUT; return VAR_HARDEN_LARGE_QUERIES;} harden-glue{COLON} { YDOUT; return VAR_HARDEN_GLUE;} +harden-dnssec-stripped{COLON} { YDOUT; return VAR_HARDEN_DNNSEC_STRIPPED;} stub-zone{COLON} { YDOUT; return VAR_STUB_ZONE;} name{COLON} { YDOUT; return VAR_NAME;} stub-addr{COLON} { YDOUT; return VAR_STUB_ADDR;} diff --git a/util/configparser.c b/util/configparser.c index a6528e857..82dd39905 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -134,7 +134,8 @@ VAR_OUTGOING_INTERFACE = 323, VAR_ROOT_HINTS = 324, VAR_DO_NOT_QUERY_LOCALHOST = 325, - VAR_CACHE_MAX_TTL = 326 + VAR_CACHE_MAX_TTL = 326, + VAR_HARDEN_DNNSEC_STRIPPED = 327 }; #endif /* Tokens. */ @@ -207,6 +208,7 @@ #define VAR_ROOT_HINTS 324 #define VAR_DO_NOT_QUERY_LOCALHOST 325 #define VAR_CACHE_MAX_TTL 326 +#define VAR_HARDEN_DNNSEC_STRIPPED 327 @@ -265,7 +267,7 @@ typedef union YYSTYPE char* str; } /* Line 187 of yacc.c. */ -#line 269 "util/configparser.c" +#line 271 "util/configparser.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -278,7 +280,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 282 "util/configparser.c" +#line 284 "util/configparser.c" #ifdef short # undef short @@ -493,20 +495,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 123 +#define YYLAST 125 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 72 +#define YYNTOKENS 73 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 71 +#define YYNNTS 72 /* YYNRULES -- Number of rules. */ -#define YYNRULES 133 +#define YYNRULES 135 /* YYNRULES -- Number of states. */ -#define YYNSTATES 193 +#define YYNSTATES 196 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 326 +#define YYMAXUTOK 327 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -546,7 +548,7 @@ static const yytype_uint8 yytranslate[] = 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71 + 65, 66, 67, 68, 69, 70, 71, 72 }; #if YYDEBUG @@ -560,52 +562,53 @@ static const yytype_uint16 yyprhs[] = 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, - 122, 124, 126, 128, 130, 133, 134, 136, 138, 140, - 142, 145, 146, 148, 150, 152, 155, 158, 161, 164, - 167, 170, 173, 176, 179, 182, 185, 188, 191, 194, - 197, 200, 203, 206, 209, 212, 215, 218, 221, 224, - 227, 230, 233, 236, 239, 242, 245, 248, 251, 254, - 257, 260, 263, 266, 269, 272, 275, 278, 281, 284, - 287, 290, 293, 296, 299, 302, 305, 308, 311, 314, - 317, 320, 323, 326 + 122, 124, 126, 128, 130, 132, 135, 136, 138, 140, + 142, 144, 147, 148, 150, 152, 154, 157, 160, 163, + 166, 169, 172, 175, 178, 181, 184, 187, 190, 193, + 196, 199, 202, 205, 208, 211, 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 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 73, 0, -1, -1, 73, 74, -1, 75, 76, -1, - 78, 79, -1, 81, 82, -1, 11, -1, 76, 77, - -1, -1, 84, -1, 85, -1, 86, -1, 89, -1, - 90, -1, 93, -1, 94, -1, 95, -1, 96, -1, - 87, -1, 98, -1, 99, -1, 100, -1, 101, -1, - 102, -1, 112, -1, 113, -1, 114, -1, 115, -1, - 116, -1, 91, -1, 117, -1, 118, -1, 121, -1, - 119, -1, 120, -1, 122, -1, 123, -1, 124, -1, - 126, -1, 107, -1, 108, -1, 109, -1, 110, -1, - 125, -1, 128, -1, 104, -1, 106, -1, 129, -1, - 131, -1, 132, -1, 133, -1, 92, -1, 111, -1, - 135, -1, 136, -1, 105, -1, 134, -1, 97, -1, - 88, -1, 103, -1, 127, -1, 130, -1, 39, -1, - 79, 80, -1, -1, 137, -1, 138, -1, 139, -1, - 45, -1, 82, 83, -1, -1, 140, -1, 141, -1, - 142, -1, 13, 10, -1, 12, 10, -1, 14, 10, - -1, 17, 10, -1, 68, 10, -1, 15, 10, -1, - 16, 10, -1, 32, 10, -1, 61, 10, -1, 18, - 10, -1, 19, 10, -1, 20, 10, -1, 21, 10, - -1, 67, 10, -1, 22, 10, -1, 23, 10, -1, - 24, 10, -1, 25, 10, -1, 26, 10, -1, 69, - 10, -1, 55, 10, -1, 65, 10, -1, 56, 10, - -1, 49, 10, -1, 50, 10, -1, 51, 10, -1, - 52, 10, -1, 62, 10, -1, 27, 10, -1, 28, - 10, -1, 29, 10, -1, 30, 10, -1, 31, 10, - -1, 33, 10, -1, 34, 10, -1, 36, 10, -1, - 37, 10, -1, 35, 10, -1, 42, 10, -1, 43, - 10, -1, 44, 10, -1, 53, 10, -1, 48, 10, - -1, 70, 10, -1, 54, 10, -1, 57, 10, -1, - 71, 10, -1, 58, 10, -1, 59, 10, -1, 60, - 10, -1, 66, 10, -1, 63, 10, -1, 64, 10, - -1, 38, 10, -1, 40, 10, -1, 41, 10, -1, - 38, 10, -1, 46, 10, -1, 47, 10, -1 + 74, 0, -1, -1, 74, 75, -1, 76, 77, -1, + 79, 80, -1, 82, 83, -1, 11, -1, 77, 78, + -1, -1, 85, -1, 86, -1, 87, -1, 90, -1, + 91, -1, 94, -1, 95, -1, 96, -1, 97, -1, + 88, -1, 99, -1, 100, -1, 101, -1, 102, -1, + 103, -1, 113, -1, 114, -1, 115, -1, 116, -1, + 117, -1, 92, -1, 118, -1, 119, -1, 122, -1, + 120, -1, 121, -1, 123, -1, 124, -1, 125, -1, + 128, -1, 108, -1, 109, -1, 110, -1, 111, -1, + 126, -1, 130, -1, 105, -1, 107, -1, 131, -1, + 133, -1, 134, -1, 135, -1, 93, -1, 112, -1, + 137, -1, 138, -1, 106, -1, 136, -1, 98, -1, + 89, -1, 104, -1, 129, -1, 132, -1, 127, -1, + 39, -1, 80, 81, -1, -1, 139, -1, 140, -1, + 141, -1, 45, -1, 83, 84, -1, -1, 142, -1, + 143, -1, 144, -1, 13, 10, -1, 12, 10, -1, + 14, 10, -1, 17, 10, -1, 68, 10, -1, 15, + 10, -1, 16, 10, -1, 32, 10, -1, 61, 10, + -1, 18, 10, -1, 19, 10, -1, 20, 10, -1, + 21, 10, -1, 67, 10, -1, 22, 10, -1, 23, + 10, -1, 24, 10, -1, 25, 10, -1, 26, 10, + -1, 69, 10, -1, 55, 10, -1, 65, 10, -1, + 56, 10, -1, 49, 10, -1, 50, 10, -1, 51, + 10, -1, 52, 10, -1, 62, 10, -1, 27, 10, + -1, 28, 10, -1, 29, 10, -1, 30, 10, -1, + 31, 10, -1, 33, 10, -1, 34, 10, -1, 36, + 10, -1, 37, 10, -1, 35, 10, -1, 42, 10, + -1, 43, 10, -1, 44, 10, -1, 53, 10, -1, + 72, 10, -1, 48, 10, -1, 70, 10, -1, 54, + 10, -1, 57, 10, -1, 71, 10, -1, 58, 10, + -1, 59, 10, -1, 60, 10, -1, 66, 10, -1, + 63, 10, -1, 64, 10, -1, 38, 10, -1, 40, + 10, -1, 41, 10, -1, 38, 10, -1, 46, 10, + -1, 47, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -617,14 +620,14 @@ static const yytype_uint16 yyrline[] = 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 118, 119, 119, 119, 120, 120, 120, 121, 121, 122, 122, 123, 123, 124, 124, 125, 125, - 125, 126, 126, 128, 140, 141, 142, 142, 142, 144, - 156, 157, 158, 158, 158, 160, 169, 178, 187, 200, - 215, 224, 233, 242, 251, 260, 269, 278, 287, 301, - 308, 315, 322, 330, 337, 344, 352, 360, 367, 376, - 385, 392, 399, 410, 419, 432, 441, 450, 463, 472, - 481, 490, 499, 512, 519, 529, 539, 549, 556, 566, - 573, 591, 600, 609, 619, 629, 636, 645, 658, 665, - 672, 679, 686, 693 + 125, 126, 126, 127, 129, 141, 142, 143, 143, 143, + 145, 157, 158, 159, 159, 159, 161, 170, 179, 188, + 201, 216, 225, 234, 243, 252, 261, 270, 279, 288, + 302, 309, 316, 323, 331, 338, 345, 353, 361, 368, + 377, 386, 393, 400, 411, 420, 433, 442, 451, 464, + 473, 482, 491, 500, 513, 520, 530, 540, 550, 560, + 567, 577, 584, 602, 611, 620, 630, 640, 647, 656, + 669, 676, 683, 690, 697, 704 }; #endif @@ -654,15 +657,16 @@ static const char *const yytname[] = "VAR_KEY_CACHE_SIZE", "VAR_KEY_CACHE_SLABS", "VAR_TRUSTED_KEYS_FILE", "VAR_VAL_NSEC3_KEYSIZE_ITERATIONS", "VAR_USE_SYSLOG", "VAR_OUTGOING_INTERFACE", "VAR_ROOT_HINTS", "VAR_DO_NOT_QUERY_LOCALHOST", - "VAR_CACHE_MAX_TTL", "$accept", "toplevelvars", "toplevelvar", - "serverstart", "contents_server", "content_server", "stubstart", - "contents_stub", "content_stub", "forwardstart", "contents_forward", - "content_forward", "server_num_threads", "server_verbosity", - "server_port", "server_interface", "server_outgoing_interface", - "server_outgoing_port", "server_outgoing_range", - "server_outgoing_num_tcp", "server_incoming_num_tcp", "server_do_ip4", - "server_do_ip6", "server_do_udp", "server_do_tcp", "server_use_syslog", - "server_chroot", "server_username", "server_directory", "server_logfile", + "VAR_CACHE_MAX_TTL", "VAR_HARDEN_DNNSEC_STRIPPED", "$accept", + "toplevelvars", "toplevelvar", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", + "server_num_threads", "server_verbosity", "server_port", + "server_interface", "server_outgoing_interface", "server_outgoing_port", + "server_outgoing_range", "server_outgoing_num_tcp", + "server_incoming_num_tcp", "server_do_ip4", "server_do_ip6", + "server_do_udp", "server_do_tcp", "server_use_syslog", "server_chroot", + "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_trust_anchor_file", "server_trusted_keys_file", "server_trust_anchor", "server_hide_identity", "server_hide_version", "server_identity", @@ -673,13 +677,13 @@ static const char *const yytname[] = "server_infra_cache_numhosts", "server_infra_cache_lame_size", "server_infra_cache_slabs", "server_target_fetch_policy", "server_harden_short_bufsize", "server_harden_large_queries", - "server_harden_glue", "server_do_not_query_address", - "server_do_not_query_localhost", "server_module_conf", - "server_val_override_date", "server_cache_max_ttl", "server_bogus_ttl", - "server_val_clean_additional", "server_val_permissive_mode", - "server_val_nsec3_keysize_iterations", "server_key_cache_size", - "server_key_cache_slabs", "stub_name", "stub_host", "stub_addr", - "forward_name", "forward_host", "forward_addr", 0 + "server_harden_glue", "server_harden_dnssec_stripped", + "server_do_not_query_address", "server_do_not_query_localhost", + "server_module_conf", "server_val_override_date", "server_cache_max_ttl", + "server_bogus_ttl", "server_val_clean_additional", + "server_val_permissive_mode", "server_val_nsec3_keysize_iterations", + "server_key_cache_size", "server_key_cache_slabs", "stub_name", + "stub_host", "stub_addr", "forward_name", "forward_host", "forward_addr", 0 }; #endif @@ -695,27 +699,27 @@ static const yytype_uint16 yytoknum[] = 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326 + 325, 326, 327 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 72, 73, 73, 74, 74, 74, 75, 76, 76, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 78, 79, 79, 80, 80, 80, 81, - 82, 82, 83, 83, 83, 84, 85, 86, 87, 88, + 0, 73, 74, 74, 75, 75, 75, 76, 77, 77, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, + 78, 78, 78, 78, 79, 80, 80, 81, 81, 81, + 82, 83, 83, 84, 84, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142 + 139, 140, 141, 142, 143, 144 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -727,14 +731,14 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2 + 2, 2, 2, 2, 2, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -742,39 +746,39 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 2, 0, 1, 7, 63, 69, 3, 9, 65, 71, + 2, 0, 1, 7, 64, 70, 3, 9, 66, 72, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 8, 10, 11, 12, - 19, 59, 13, 14, 30, 52, 15, 16, 17, 18, - 58, 20, 21, 22, 23, 24, 60, 46, 56, 47, - 40, 41, 42, 43, 53, 25, 26, 27, 28, 29, - 31, 32, 34, 35, 33, 36, 37, 38, 44, 39, - 61, 45, 48, 62, 49, 50, 51, 57, 54, 55, - 0, 0, 0, 64, 66, 67, 68, 0, 0, 0, - 70, 72, 73, 74, 76, 75, 77, 80, 81, 78, - 84, 85, 86, 87, 89, 90, 91, 92, 93, 103, - 104, 105, 106, 107, 82, 108, 109, 112, 110, 111, - 113, 114, 115, 117, 98, 99, 100, 101, 116, 119, - 95, 97, 120, 122, 123, 124, 83, 102, 126, 127, - 96, 125, 88, 79, 94, 118, 121, 128, 129, 130, - 131, 132, 133 + 0, 0, 0, 0, 0, 0, 0, 8, 10, 11, + 12, 19, 59, 13, 14, 30, 52, 15, 16, 17, + 18, 58, 20, 21, 22, 23, 24, 60, 46, 56, + 47, 40, 41, 42, 43, 53, 25, 26, 27, 28, + 29, 31, 32, 34, 35, 33, 36, 37, 38, 44, + 63, 39, 61, 45, 48, 62, 49, 50, 51, 57, + 54, 55, 0, 0, 0, 65, 67, 68, 69, 0, + 0, 0, 71, 73, 74, 75, 77, 76, 78, 81, + 82, 79, 85, 86, 87, 88, 90, 91, 92, 93, + 94, 104, 105, 106, 107, 108, 83, 109, 110, 113, + 111, 112, 114, 115, 116, 119, 99, 100, 101, 102, + 117, 121, 96, 98, 122, 124, 125, 126, 84, 103, + 128, 129, 97, 127, 89, 80, 95, 120, 123, 118, + 130, 131, 132, 133, 134, 135 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 6, 7, 10, 66, 8, 11, 123, 9, - 12, 130, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 124, 125, 126, 131, 132, - 133 + -1, 1, 6, 7, 10, 67, 8, 11, 125, 9, + 12, 132, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 126, 127, 128, 133, + 134, 135 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -782,26 +786,26 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -13 static const yytype_int8 yypact[] = { - -13, 60, -13, -13, -13, -13, -13, -13, -13, -13, - -12, 24, 23, 16, 17, 18, 19, 25, 53, 56, - 57, 58, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 90, - 91, 92, 93, 94, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, -13, -13, -13, -13, + -13, 61, -13, -13, -13, -13, -13, -13, -13, -13, + -12, 25, 24, 16, 17, 18, 19, 23, 54, 57, + 58, 59, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, + 92, 93, 94, 95, 97, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 108, 109, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - 108, 109, 110, -13, -13, -13, -13, 111, 112, 113, + -13, -13, 110, 111, 112, -13, -13, -13, -13, 113, + 114, 115, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13, -13, -13 + -13, -13, -13, -13, -13, -13 }; /* YYPGOTO[NTERM-NUM]. */ @@ -814,7 +818,7 @@ static const yytype_int8 yypgoto[] = -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, -13, - -13 + -13, -13 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -826,17 +830,17 @@ static const yytype_uint8 yytable[] = { 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 134, 135, 136, 137, - 39, 40, 41, 0, 0, 138, 42, 43, 44, 45, + 33, 34, 35, 36, 37, 38, 136, 137, 138, 139, + 39, 40, 41, 140, 0, 0, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 2, 127, 120, 139, 121, 122, 140, 141, 142, 128, - 129, 3, 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, 4, - 170, 171, 172, 173, 174, 5, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192 + 66, 2, 129, 122, 141, 123, 124, 142, 143, 144, + 130, 131, 3, 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, + 4, 172, 173, 174, 175, 176, 5, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 192, 193, 194, 195 }; static const yytype_int8 yycheck[] = @@ -844,42 +848,42 @@ static const yytype_int8 yycheck[] = 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 10, 10, 10, 10, - 42, 43, 44, -1, -1, 10, 48, 49, 50, 51, + 42, 43, 44, 10, -1, -1, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 0, 38, 38, 10, 40, 41, 10, 10, 10, 46, - 47, 11, 10, 10, 10, 10, 10, 10, 10, 10, + 72, 0, 38, 38, 10, 40, 41, 10, 10, 10, + 46, 47, 11, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 39, - 10, 10, 10, 10, 10, 45, 10, 10, 10, 10, + 39, 10, 10, 10, 10, 10, 45, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 73, 0, 11, 39, 45, 74, 75, 78, 81, - 76, 79, 82, 12, 13, 14, 15, 16, 17, 18, + 0, 74, 0, 11, 39, 45, 75, 76, 79, 82, + 77, 80, 83, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 42, 43, 44, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 77, 84, 85, 86, + 66, 67, 68, 69, 70, 71, 72, 78, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 38, 40, 41, 80, 137, 138, 139, 38, 46, 47, - 83, 140, 141, 142, 10, 10, 10, 10, 10, 10, + 137, 138, 38, 40, 41, 81, 139, 140, 141, 38, + 46, 47, 84, 142, 143, 144, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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) @@ -1700,8 +1704,8 @@ yyreduce: } break; - case 63: -#line 129 "util/configparser.y" + case 64: +#line 130 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -1714,8 +1718,8 @@ yyreduce: } break; - case 69: -#line 145 "util/configparser.y" + case 70: +#line 146 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -1728,8 +1732,8 @@ yyreduce: } break; - case 75: -#line 161 "util/configparser.y" + case 76: +#line 162 "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) @@ -1739,8 +1743,8 @@ yyreduce: } break; - case 76: -#line 170 "util/configparser.y" + case 77: +#line 171 "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) @@ -1750,8 +1754,8 @@ yyreduce: } break; - case 77: -#line 179 "util/configparser.y" + case 78: +#line 180 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1761,8 +1765,8 @@ yyreduce: } break; - case 78: -#line 188 "util/configparser.y" + case 79: +#line 189 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -1776,8 +1780,8 @@ yyreduce: } break; - case 79: -#line 201 "util/configparser.y" + case 80: +#line 202 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -1793,8 +1797,8 @@ yyreduce: } break; - case 80: -#line 216 "util/configparser.y" + case 81: +#line 217 "util/configparser.y" { OUTYY(("P(server_outgoing_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1804,8 +1808,8 @@ yyreduce: } break; - case 81: -#line 225 "util/configparser.y" + case 82: +#line 226 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -1815,8 +1819,8 @@ yyreduce: } break; - case 82: -#line 234 "util/configparser.y" + case 83: +#line 235 "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) @@ -1826,8 +1830,8 @@ yyreduce: } break; - case 83: -#line 243 "util/configparser.y" + case 84: +#line 244 "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) @@ -1837,8 +1841,8 @@ yyreduce: } break; - case 84: -#line 252 "util/configparser.y" + case 85: +#line 253 "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) @@ -1848,8 +1852,8 @@ yyreduce: } break; - case 85: -#line 261 "util/configparser.y" + case 86: +#line 262 "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) @@ -1859,8 +1863,8 @@ yyreduce: } break; - case 86: -#line 270 "util/configparser.y" + case 87: +#line 271 "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) @@ -1870,8 +1874,8 @@ yyreduce: } break; - case 87: -#line 279 "util/configparser.y" + case 88: +#line 280 "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) @@ -1881,8 +1885,8 @@ yyreduce: } break; - case 88: -#line 288 "util/configparser.y" + case 89: +#line 289 "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) @@ -1897,8 +1901,8 @@ yyreduce: } break; - case 89: -#line 302 "util/configparser.y" + case 90: +#line 303 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -1906,8 +1910,8 @@ yyreduce: } break; - case 90: -#line 309 "util/configparser.y" + case 91: +#line 310 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -1915,8 +1919,8 @@ yyreduce: } break; - case 91: -#line 316 "util/configparser.y" + case 92: +#line 317 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -1924,8 +1928,8 @@ yyreduce: } break; - case 92: -#line 323 "util/configparser.y" + case 93: +#line 324 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -1934,8 +1938,8 @@ yyreduce: } break; - case 93: -#line 331 "util/configparser.y" + case 94: +#line 332 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -1943,8 +1947,8 @@ yyreduce: } break; - case 94: -#line 338 "util/configparser.y" + case 95: +#line 339 "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))) @@ -1952,8 +1956,8 @@ yyreduce: } break; - case 95: -#line 345 "util/configparser.y" + case 96: +#line 346 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1962,8 +1966,8 @@ yyreduce: } break; - case 96: -#line 353 "util/configparser.y" + case 97: +#line 354 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -1972,8 +1976,8 @@ yyreduce: } break; - case 97: -#line 361 "util/configparser.y" + case 98: +#line 362 "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))) @@ -1981,8 +1985,8 @@ yyreduce: } break; - case 98: -#line 368 "util/configparser.y" + case 99: +#line 369 "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) @@ -1992,8 +1996,8 @@ yyreduce: } break; - case 99: -#line 377 "util/configparser.y" + case 100: +#line 378 "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) @@ -2003,8 +2007,8 @@ yyreduce: } break; - case 100: -#line 386 "util/configparser.y" + case 101: +#line 387 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2012,8 +2016,8 @@ yyreduce: } break; - case 101: -#line 393 "util/configparser.y" + case 102: +#line 394 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2021,8 +2025,8 @@ yyreduce: } break; - case 102: -#line 400 "util/configparser.y" + case 103: +#line 401 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2034,8 +2038,8 @@ yyreduce: } break; - case 103: -#line 411 "util/configparser.y" + case 104: +#line 412 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2045,8 +2049,8 @@ yyreduce: } break; - case 104: -#line 420 "util/configparser.y" + case 105: +#line 421 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2060,8 +2064,8 @@ yyreduce: } break; - case 105: -#line 433 "util/configparser.y" + case 106: +#line 434 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2071,8 +2075,8 @@ yyreduce: } break; - case 106: -#line 442 "util/configparser.y" + case 107: +#line 443 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2082,8 +2086,8 @@ yyreduce: } break; - case 107: -#line 451 "util/configparser.y" + case 108: +#line 452 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2097,8 +2101,8 @@ yyreduce: } break; - case 108: -#line 464 "util/configparser.y" + case 109: +#line 465 "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) @@ -2108,8 +2112,8 @@ yyreduce: } break; - case 109: -#line 473 "util/configparser.y" + case 110: +#line 474 "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) @@ -2119,8 +2123,8 @@ yyreduce: } break; - case 110: -#line 482 "util/configparser.y" + case 111: +#line 483 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2130,8 +2134,8 @@ yyreduce: } break; - case 111: -#line 491 "util/configparser.y" + case 112: +#line 492 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2141,8 +2145,8 @@ yyreduce: } break; - case 112: -#line 500 "util/configparser.y" + case 113: +#line 501 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2156,8 +2160,8 @@ yyreduce: } break; - case 113: -#line 513 "util/configparser.y" + case 114: +#line 514 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2165,8 +2169,8 @@ yyreduce: } break; - case 114: -#line 520 "util/configparser.y" + case 115: +#line 521 "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) @@ -2177,8 +2181,8 @@ yyreduce: } break; - case 115: -#line 530 "util/configparser.y" + case 116: +#line 531 "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) @@ -2189,8 +2193,8 @@ yyreduce: } break; - case 116: -#line 540 "util/configparser.y" + case 117: +#line 541 "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) @@ -2201,8 +2205,20 @@ yyreduce: } break; - case 117: -#line 550 "util/configparser.y" + case 118: +#line 551 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->harden_dnssec_stripped = + (strcmp((yyvsp[(2) - (2)].str), "yes")==0); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 119: +#line 561 "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))) @@ -2210,8 +2226,8 @@ yyreduce: } break; - case 118: -#line 557 "util/configparser.y" + case 120: +#line 568 "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) @@ -2222,8 +2238,8 @@ yyreduce: } break; - case 119: -#line 567 "util/configparser.y" + case 121: +#line 578 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -2231,8 +2247,8 @@ yyreduce: } break; - case 120: -#line 574 "util/configparser.y" + case 122: +#line 585 "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) { @@ -2251,8 +2267,8 @@ yyreduce: } break; - case 121: -#line 592 "util/configparser.y" + case 123: +#line 603 "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) @@ -2262,8 +2278,8 @@ yyreduce: } break; - case 122: -#line 601 "util/configparser.y" + case 124: +#line 612 "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) @@ -2273,8 +2289,8 @@ yyreduce: } break; - case 123: -#line 610 "util/configparser.y" + case 125: +#line 621 "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) @@ -2285,8 +2301,8 @@ yyreduce: } break; - case 124: -#line 620 "util/configparser.y" + case 126: +#line 631 "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) @@ -2297,8 +2313,8 @@ yyreduce: } break; - case 125: -#line 630 "util/configparser.y" + case 127: +#line 641 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -2306,8 +2322,8 @@ yyreduce: } break; - case 126: -#line 637 "util/configparser.y" + case 128: +#line 648 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2317,8 +2333,8 @@ yyreduce: } break; - case 127: -#line 646 "util/configparser.y" + case 129: +#line 657 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2332,8 +2348,8 @@ yyreduce: } break; - case 128: -#line 659 "util/configparser.y" + case 130: +#line 670 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->stubs->name); @@ -2341,8 +2357,8 @@ yyreduce: } break; - case 129: -#line 666 "util/configparser.y" + case 131: +#line 677 "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))) @@ -2350,8 +2366,8 @@ yyreduce: } break; - case 130: -#line 673 "util/configparser.y" + case 132: +#line 684 "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))) @@ -2359,8 +2375,8 @@ yyreduce: } break; - case 131: -#line 680 "util/configparser.y" + case 133: +#line 691 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->forwards->name); @@ -2368,8 +2384,8 @@ yyreduce: } break; - case 132: -#line 687 "util/configparser.y" + case 134: +#line 698 "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))) @@ -2377,8 +2393,8 @@ yyreduce: } break; - case 133: -#line 694 "util/configparser.y" + case 135: +#line 705 "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))) @@ -2388,7 +2404,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2392 "util/configparser.c" +#line 2408 "util/configparser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2602,7 +2618,7 @@ yyreturn: } -#line 700 "util/configparser.y" +#line 711 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 7c6784780..6d42264da 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -107,7 +107,8 @@ VAR_OUTGOING_INTERFACE = 323, VAR_ROOT_HINTS = 324, VAR_DO_NOT_QUERY_LOCALHOST = 325, - VAR_CACHE_MAX_TTL = 326 + VAR_CACHE_MAX_TTL = 326, + VAR_HARDEN_DNNSEC_STRIPPED = 327 }; #endif /* Tokens. */ @@ -180,6 +181,7 @@ #define VAR_ROOT_HINTS 324 #define VAR_DO_NOT_QUERY_LOCALHOST 325 #define VAR_CACHE_MAX_TTL 326 +#define VAR_HARDEN_DNNSEC_STRIPPED 327 @@ -191,7 +193,7 @@ typedef union YYSTYPE char* str; } /* Line 1489 of yacc.c. */ -#line 195 "util/configparser.h" +#line 197 "util/configparser.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/util/configparser.y b/util/configparser.y index 7a2991c58..df6ba2232 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -86,7 +86,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_KEY_CACHE_SLABS VAR_TRUSTED_KEYS_FILE %token VAR_VAL_NSEC3_KEYSIZE_ITERATIONS VAR_USE_SYSLOG %token VAR_OUTGOING_INTERFACE VAR_ROOT_HINTS VAR_DO_NOT_QUERY_LOCALHOST -%token VAR_CACHE_MAX_TTL +%token VAR_CACHE_MAX_TTL VAR_HARDEN_DNNSEC_STRIPPED %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -123,7 +123,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_key_cache_size | server_key_cache_slabs | server_trusted_keys_file | server_val_nsec3_keysize_iterations | server_use_syslog | server_outgoing_interface | server_root_hints | - server_do_not_query_localhost | server_cache_max_ttl + server_do_not_query_localhost | server_cache_max_ttl | + server_harden_dnssec_stripped ; stubstart: VAR_STUB_ZONE { @@ -546,6 +547,16 @@ server_harden_glue: VAR_HARDEN_GLUE STRING free($2); } ; +server_harden_dnssec_stripped: VAR_HARDEN_DNNSEC_STRIPPED STRING + { + OUTYY(("P(server_harden_dnssec_stripped:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->harden_dnssec_stripped = + (strcmp($2, "yes")==0); + free($2); + } + ; server_do_not_query_address: VAR_DO_NOT_QUERY_ADDRESS STRING { OUTYY(("P(server_do_not_query_address:%s)\n", $2)); diff --git a/validator/validator.c b/validator/validator.c index 920f3d83c..42ce92608 100644 --- a/validator/validator.c +++ b/validator/validator.c @@ -1665,10 +1665,13 @@ primeResponseToKE(int rcode, struct dns_msg* msg, struct trust_anchor* ta, log_nametypeclass(VERB_OPS, "failed to prime trust anchor -- " "could not fetch DNSKEY rrset", ta->name, LDNS_RR_TYPE_DNSKEY, ta->dclass); - kkey = key_entry_create_null(qstate->region, ta->name, - ta->namelen, ta->dclass, NULL_KEY_TTL); + if(qstate->env->cfg->harden_dnssec_stripped) + kkey = key_entry_create_bad(qstate->region, ta->name, + ta->namelen, ta->dclass); + else kkey = key_entry_create_null(qstate->region, ta->name, + ta->namelen, ta->dclass, NULL_KEY_TTL); if(!kkey) { - log_err("out of memory: allocate null prime key"); + log_err("out of memory: allocate fail prime key"); return NULL; } key_cache_insert(ve->kcache, kkey); @@ -1709,8 +1712,11 @@ primeResponseToKE(int rcode, struct dns_msg* msg, struct trust_anchor* ta, ta->name, LDNS_RR_TYPE_DNSKEY, ta->dclass); /* NOTE: in this case, we should probably reject the trust * anchor for longer, perhaps forever. */ - kkey = key_entry_create_null(qstate->region, ta->name, - ta->namelen, ta->dclass, NULL_KEY_TTL); + if(qstate->env->cfg->harden_dnssec_stripped) + kkey = key_entry_create_bad(qstate->region, ta->name, + ta->namelen, ta->dclass); + else kkey = key_entry_create_null(qstate->region, ta->name, + ta->namelen, ta->dclass, NULL_KEY_TTL); if(!kkey) { log_err("out of memory: allocate null prime key"); return NULL; @@ -2022,7 +2028,8 @@ process_prime_response(struct module_qstate* qstate, struct val_qstate* vq, qstate, id); /* If the result of the prime is a null key, skip the FINDKEY state.*/ - if(!vq->key_entry || key_entry_isnull(vq->key_entry)) { + if(!vq->key_entry || key_entry_isnull(vq->key_entry) || + key_entry_isbad(vq->key_entry)) { vq->state = VAL_VALIDATE_STATE; } /* the qstate will be reactivated after inform_super is done */ -- 2.47.2