diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 2767 |
1 files changed, 1480 insertions, 1287 deletions
diff --git a/util/configparser.c b/util/configparser.c index 268949e4a143..421339fe9754 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -258,95 +258,105 @@ extern int yydebug; VAR_FORWARD_FIRST = 387, VAR_STUB_SSL_UPSTREAM = 388, VAR_FORWARD_SSL_UPSTREAM = 389, - VAR_STUB_FIRST = 390, - VAR_MINIMAL_RESPONSES = 391, - VAR_RRSET_ROUNDROBIN = 392, - VAR_MAX_UDP_SIZE = 393, - VAR_DELAY_CLOSE = 394, - VAR_UNBLOCK_LAN_ZONES = 395, - VAR_INSECURE_LAN_ZONES = 396, - VAR_INFRA_CACHE_MIN_RTT = 397, - VAR_DNS64_PREFIX = 398, - VAR_DNS64_SYNTHALL = 399, - VAR_DNSTAP = 400, - VAR_DNSTAP_ENABLE = 401, - VAR_DNSTAP_SOCKET_PATH = 402, - VAR_DNSTAP_SEND_IDENTITY = 403, - VAR_DNSTAP_SEND_VERSION = 404, - VAR_DNSTAP_IDENTITY = 405, - VAR_DNSTAP_VERSION = 406, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 407, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 408, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 409, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 410, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 411, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 412, - VAR_RESPONSE_IP_TAG = 413, - VAR_RESPONSE_IP = 414, - VAR_RESPONSE_IP_DATA = 415, - VAR_HARDEN_ALGO_DOWNGRADE = 416, - VAR_IP_TRANSPARENT = 417, - VAR_DISABLE_DNSSEC_LAME_CHECK = 418, - VAR_IP_RATELIMIT = 419, - VAR_IP_RATELIMIT_SLABS = 420, - VAR_IP_RATELIMIT_SIZE = 421, - VAR_RATELIMIT = 422, - VAR_RATELIMIT_SLABS = 423, - VAR_RATELIMIT_SIZE = 424, - VAR_RATELIMIT_FOR_DOMAIN = 425, - VAR_RATELIMIT_BELOW_DOMAIN = 426, - VAR_IP_RATELIMIT_FACTOR = 427, - VAR_RATELIMIT_FACTOR = 428, - VAR_SEND_CLIENT_SUBNET = 429, - VAR_CLIENT_SUBNET_ZONE = 430, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 431, - VAR_CLIENT_SUBNET_OPCODE = 432, - VAR_MAX_CLIENT_SUBNET_IPV4 = 433, - VAR_MAX_CLIENT_SUBNET_IPV6 = 434, - VAR_CAPS_WHITELIST = 435, - VAR_CACHE_MAX_NEGATIVE_TTL = 436, - VAR_PERMIT_SMALL_HOLDDOWN = 437, - VAR_QNAME_MINIMISATION = 438, - VAR_QNAME_MINIMISATION_STRICT = 439, - VAR_IP_FREEBIND = 440, - VAR_DEFINE_TAG = 441, - VAR_LOCAL_ZONE_TAG = 442, - VAR_ACCESS_CONTROL_TAG = 443, - VAR_LOCAL_ZONE_OVERRIDE = 444, - VAR_ACCESS_CONTROL_TAG_ACTION = 445, - VAR_ACCESS_CONTROL_TAG_DATA = 446, - VAR_VIEW = 447, - VAR_ACCESS_CONTROL_VIEW = 448, - VAR_VIEW_FIRST = 449, - VAR_SERVE_EXPIRED = 450, - VAR_FAKE_DSA = 451, - VAR_FAKE_SHA1 = 452, - VAR_LOG_IDENTITY = 453, - VAR_HIDE_TRUSTANCHOR = 454, - VAR_TRUST_ANCHOR_SIGNALING = 455, - VAR_USE_SYSTEMD = 456, - VAR_SHM_ENABLE = 457, - VAR_SHM_KEY = 458, - VAR_DNSCRYPT = 459, - VAR_DNSCRYPT_ENABLE = 460, - VAR_DNSCRYPT_PORT = 461, - VAR_DNSCRYPT_PROVIDER = 462, - VAR_DNSCRYPT_SECRET_KEY = 463, - VAR_DNSCRYPT_PROVIDER_CERT = 464, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 465, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 466, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 467, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 468, - VAR_IPSECMOD_ENABLED = 469, - VAR_IPSECMOD_HOOK = 470, - VAR_IPSECMOD_IGNORE_BOGUS = 471, - VAR_IPSECMOD_MAX_TTL = 472, - VAR_IPSECMOD_WHITELIST = 473, - VAR_IPSECMOD_STRICT = 474, - VAR_CACHEDB = 475, - VAR_CACHEDB_BACKEND = 476, - VAR_CACHEDB_SECRETSEED = 477, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 478 + VAR_TLS_CERT_BUNDLE = 390, + VAR_STUB_FIRST = 391, + VAR_MINIMAL_RESPONSES = 392, + VAR_RRSET_ROUNDROBIN = 393, + VAR_MAX_UDP_SIZE = 394, + VAR_DELAY_CLOSE = 395, + VAR_UNBLOCK_LAN_ZONES = 396, + VAR_INSECURE_LAN_ZONES = 397, + VAR_INFRA_CACHE_MIN_RTT = 398, + VAR_DNS64_PREFIX = 399, + VAR_DNS64_SYNTHALL = 400, + VAR_DNSTAP = 401, + VAR_DNSTAP_ENABLE = 402, + VAR_DNSTAP_SOCKET_PATH = 403, + VAR_DNSTAP_SEND_IDENTITY = 404, + VAR_DNSTAP_SEND_VERSION = 405, + VAR_DNSTAP_IDENTITY = 406, + VAR_DNSTAP_VERSION = 407, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 408, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 409, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 410, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 411, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 412, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 413, + VAR_RESPONSE_IP_TAG = 414, + VAR_RESPONSE_IP = 415, + VAR_RESPONSE_IP_DATA = 416, + VAR_HARDEN_ALGO_DOWNGRADE = 417, + VAR_IP_TRANSPARENT = 418, + VAR_DISABLE_DNSSEC_LAME_CHECK = 419, + VAR_IP_RATELIMIT = 420, + VAR_IP_RATELIMIT_SLABS = 421, + VAR_IP_RATELIMIT_SIZE = 422, + VAR_RATELIMIT = 423, + VAR_RATELIMIT_SLABS = 424, + VAR_RATELIMIT_SIZE = 425, + VAR_RATELIMIT_FOR_DOMAIN = 426, + VAR_RATELIMIT_BELOW_DOMAIN = 427, + VAR_IP_RATELIMIT_FACTOR = 428, + VAR_RATELIMIT_FACTOR = 429, + VAR_SEND_CLIENT_SUBNET = 430, + VAR_CLIENT_SUBNET_ZONE = 431, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 432, + VAR_CLIENT_SUBNET_OPCODE = 433, + VAR_MAX_CLIENT_SUBNET_IPV4 = 434, + VAR_MAX_CLIENT_SUBNET_IPV6 = 435, + VAR_CAPS_WHITELIST = 436, + VAR_CACHE_MAX_NEGATIVE_TTL = 437, + VAR_PERMIT_SMALL_HOLDDOWN = 438, + VAR_QNAME_MINIMISATION = 439, + VAR_QNAME_MINIMISATION_STRICT = 440, + VAR_IP_FREEBIND = 441, + VAR_DEFINE_TAG = 442, + VAR_LOCAL_ZONE_TAG = 443, + VAR_ACCESS_CONTROL_TAG = 444, + VAR_LOCAL_ZONE_OVERRIDE = 445, + VAR_ACCESS_CONTROL_TAG_ACTION = 446, + VAR_ACCESS_CONTROL_TAG_DATA = 447, + VAR_VIEW = 448, + VAR_ACCESS_CONTROL_VIEW = 449, + VAR_VIEW_FIRST = 450, + VAR_SERVE_EXPIRED = 451, + VAR_FAKE_DSA = 452, + VAR_FAKE_SHA1 = 453, + VAR_LOG_IDENTITY = 454, + VAR_HIDE_TRUSTANCHOR = 455, + VAR_TRUST_ANCHOR_SIGNALING = 456, + VAR_AGGRESSIVE_NSEC = 457, + VAR_USE_SYSTEMD = 458, + VAR_SHM_ENABLE = 459, + VAR_SHM_KEY = 460, + VAR_DNSCRYPT = 461, + VAR_DNSCRYPT_ENABLE = 462, + VAR_DNSCRYPT_PORT = 463, + VAR_DNSCRYPT_PROVIDER = 464, + VAR_DNSCRYPT_SECRET_KEY = 465, + VAR_DNSCRYPT_PROVIDER_CERT = 466, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 467, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 468, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 469, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 470, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 471, + VAR_IPSECMOD_ENABLED = 472, + VAR_IPSECMOD_HOOK = 473, + VAR_IPSECMOD_IGNORE_BOGUS = 474, + VAR_IPSECMOD_MAX_TTL = 475, + VAR_IPSECMOD_WHITELIST = 476, + VAR_IPSECMOD_STRICT = 477, + VAR_CACHEDB = 478, + VAR_CACHEDB_BACKEND = 479, + VAR_CACHEDB_SECRETSEED = 480, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 481, + VAR_FOR_UPSTREAM = 482, + VAR_AUTH_ZONE = 483, + VAR_ZONEFILE = 484, + VAR_MASTER = 485, + VAR_URL = 486, + VAR_FOR_DOWNSTREAM = 487, + VAR_FALLBACK_ENABLED = 488 }; #endif /* Tokens. */ @@ -482,95 +492,105 @@ extern int yydebug; #define VAR_FORWARD_FIRST 387 #define VAR_STUB_SSL_UPSTREAM 388 #define VAR_FORWARD_SSL_UPSTREAM 389 -#define VAR_STUB_FIRST 390 -#define VAR_MINIMAL_RESPONSES 391 -#define VAR_RRSET_ROUNDROBIN 392 -#define VAR_MAX_UDP_SIZE 393 -#define VAR_DELAY_CLOSE 394 -#define VAR_UNBLOCK_LAN_ZONES 395 -#define VAR_INSECURE_LAN_ZONES 396 -#define VAR_INFRA_CACHE_MIN_RTT 397 -#define VAR_DNS64_PREFIX 398 -#define VAR_DNS64_SYNTHALL 399 -#define VAR_DNSTAP 400 -#define VAR_DNSTAP_ENABLE 401 -#define VAR_DNSTAP_SOCKET_PATH 402 -#define VAR_DNSTAP_SEND_IDENTITY 403 -#define VAR_DNSTAP_SEND_VERSION 404 -#define VAR_DNSTAP_IDENTITY 405 -#define VAR_DNSTAP_VERSION 406 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 407 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 408 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 409 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 410 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 411 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 412 -#define VAR_RESPONSE_IP_TAG 413 -#define VAR_RESPONSE_IP 414 -#define VAR_RESPONSE_IP_DATA 415 -#define VAR_HARDEN_ALGO_DOWNGRADE 416 -#define VAR_IP_TRANSPARENT 417 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 418 -#define VAR_IP_RATELIMIT 419 -#define VAR_IP_RATELIMIT_SLABS 420 -#define VAR_IP_RATELIMIT_SIZE 421 -#define VAR_RATELIMIT 422 -#define VAR_RATELIMIT_SLABS 423 -#define VAR_RATELIMIT_SIZE 424 -#define VAR_RATELIMIT_FOR_DOMAIN 425 -#define VAR_RATELIMIT_BELOW_DOMAIN 426 -#define VAR_IP_RATELIMIT_FACTOR 427 -#define VAR_RATELIMIT_FACTOR 428 -#define VAR_SEND_CLIENT_SUBNET 429 -#define VAR_CLIENT_SUBNET_ZONE 430 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 431 -#define VAR_CLIENT_SUBNET_OPCODE 432 -#define VAR_MAX_CLIENT_SUBNET_IPV4 433 -#define VAR_MAX_CLIENT_SUBNET_IPV6 434 -#define VAR_CAPS_WHITELIST 435 -#define VAR_CACHE_MAX_NEGATIVE_TTL 436 -#define VAR_PERMIT_SMALL_HOLDDOWN 437 -#define VAR_QNAME_MINIMISATION 438 -#define VAR_QNAME_MINIMISATION_STRICT 439 -#define VAR_IP_FREEBIND 440 -#define VAR_DEFINE_TAG 441 -#define VAR_LOCAL_ZONE_TAG 442 -#define VAR_ACCESS_CONTROL_TAG 443 -#define VAR_LOCAL_ZONE_OVERRIDE 444 -#define VAR_ACCESS_CONTROL_TAG_ACTION 445 -#define VAR_ACCESS_CONTROL_TAG_DATA 446 -#define VAR_VIEW 447 -#define VAR_ACCESS_CONTROL_VIEW 448 -#define VAR_VIEW_FIRST 449 -#define VAR_SERVE_EXPIRED 450 -#define VAR_FAKE_DSA 451 -#define VAR_FAKE_SHA1 452 -#define VAR_LOG_IDENTITY 453 -#define VAR_HIDE_TRUSTANCHOR 454 -#define VAR_TRUST_ANCHOR_SIGNALING 455 -#define VAR_USE_SYSTEMD 456 -#define VAR_SHM_ENABLE 457 -#define VAR_SHM_KEY 458 -#define VAR_DNSCRYPT 459 -#define VAR_DNSCRYPT_ENABLE 460 -#define VAR_DNSCRYPT_PORT 461 -#define VAR_DNSCRYPT_PROVIDER 462 -#define VAR_DNSCRYPT_SECRET_KEY 463 -#define VAR_DNSCRYPT_PROVIDER_CERT 464 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 465 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 466 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 467 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 468 -#define VAR_IPSECMOD_ENABLED 469 -#define VAR_IPSECMOD_HOOK 470 -#define VAR_IPSECMOD_IGNORE_BOGUS 471 -#define VAR_IPSECMOD_MAX_TTL 472 -#define VAR_IPSECMOD_WHITELIST 473 -#define VAR_IPSECMOD_STRICT 474 -#define VAR_CACHEDB 475 -#define VAR_CACHEDB_BACKEND 476 -#define VAR_CACHEDB_SECRETSEED 477 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 478 +#define VAR_TLS_CERT_BUNDLE 390 +#define VAR_STUB_FIRST 391 +#define VAR_MINIMAL_RESPONSES 392 +#define VAR_RRSET_ROUNDROBIN 393 +#define VAR_MAX_UDP_SIZE 394 +#define VAR_DELAY_CLOSE 395 +#define VAR_UNBLOCK_LAN_ZONES 396 +#define VAR_INSECURE_LAN_ZONES 397 +#define VAR_INFRA_CACHE_MIN_RTT 398 +#define VAR_DNS64_PREFIX 399 +#define VAR_DNS64_SYNTHALL 400 +#define VAR_DNSTAP 401 +#define VAR_DNSTAP_ENABLE 402 +#define VAR_DNSTAP_SOCKET_PATH 403 +#define VAR_DNSTAP_SEND_IDENTITY 404 +#define VAR_DNSTAP_SEND_VERSION 405 +#define VAR_DNSTAP_IDENTITY 406 +#define VAR_DNSTAP_VERSION 407 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 408 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 409 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 410 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 411 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 412 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 413 +#define VAR_RESPONSE_IP_TAG 414 +#define VAR_RESPONSE_IP 415 +#define VAR_RESPONSE_IP_DATA 416 +#define VAR_HARDEN_ALGO_DOWNGRADE 417 +#define VAR_IP_TRANSPARENT 418 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 419 +#define VAR_IP_RATELIMIT 420 +#define VAR_IP_RATELIMIT_SLABS 421 +#define VAR_IP_RATELIMIT_SIZE 422 +#define VAR_RATELIMIT 423 +#define VAR_RATELIMIT_SLABS 424 +#define VAR_RATELIMIT_SIZE 425 +#define VAR_RATELIMIT_FOR_DOMAIN 426 +#define VAR_RATELIMIT_BELOW_DOMAIN 427 +#define VAR_IP_RATELIMIT_FACTOR 428 +#define VAR_RATELIMIT_FACTOR 429 +#define VAR_SEND_CLIENT_SUBNET 430 +#define VAR_CLIENT_SUBNET_ZONE 431 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 432 +#define VAR_CLIENT_SUBNET_OPCODE 433 +#define VAR_MAX_CLIENT_SUBNET_IPV4 434 +#define VAR_MAX_CLIENT_SUBNET_IPV6 435 +#define VAR_CAPS_WHITELIST 436 +#define VAR_CACHE_MAX_NEGATIVE_TTL 437 +#define VAR_PERMIT_SMALL_HOLDDOWN 438 +#define VAR_QNAME_MINIMISATION 439 +#define VAR_QNAME_MINIMISATION_STRICT 440 +#define VAR_IP_FREEBIND 441 +#define VAR_DEFINE_TAG 442 +#define VAR_LOCAL_ZONE_TAG 443 +#define VAR_ACCESS_CONTROL_TAG 444 +#define VAR_LOCAL_ZONE_OVERRIDE 445 +#define VAR_ACCESS_CONTROL_TAG_ACTION 446 +#define VAR_ACCESS_CONTROL_TAG_DATA 447 +#define VAR_VIEW 448 +#define VAR_ACCESS_CONTROL_VIEW 449 +#define VAR_VIEW_FIRST 450 +#define VAR_SERVE_EXPIRED 451 +#define VAR_FAKE_DSA 452 +#define VAR_FAKE_SHA1 453 +#define VAR_LOG_IDENTITY 454 +#define VAR_HIDE_TRUSTANCHOR 455 +#define VAR_TRUST_ANCHOR_SIGNALING 456 +#define VAR_AGGRESSIVE_NSEC 457 +#define VAR_USE_SYSTEMD 458 +#define VAR_SHM_ENABLE 459 +#define VAR_SHM_KEY 460 +#define VAR_DNSCRYPT 461 +#define VAR_DNSCRYPT_ENABLE 462 +#define VAR_DNSCRYPT_PORT 463 +#define VAR_DNSCRYPT_PROVIDER 464 +#define VAR_DNSCRYPT_SECRET_KEY 465 +#define VAR_DNSCRYPT_PROVIDER_CERT 466 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 467 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 468 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 469 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 470 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 471 +#define VAR_IPSECMOD_ENABLED 472 +#define VAR_IPSECMOD_HOOK 473 +#define VAR_IPSECMOD_IGNORE_BOGUS 474 +#define VAR_IPSECMOD_MAX_TTL 475 +#define VAR_IPSECMOD_WHITELIST 476 +#define VAR_IPSECMOD_STRICT 477 +#define VAR_CACHEDB 478 +#define VAR_CACHEDB_BACKEND 479 +#define VAR_CACHEDB_SECRETSEED 480 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 481 +#define VAR_FOR_UPSTREAM 482 +#define VAR_AUTH_ZONE 483 +#define VAR_ZONEFILE 484 +#define VAR_MASTER 485 +#define VAR_URL 486 +#define VAR_FOR_DOWNSTREAM 487 +#define VAR_FALLBACK_ENABLED 488 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -581,7 +601,7 @@ union YYSTYPE char* str; -#line 585 "util/configparser.c" /* yacc.c:355 */ +#line 605 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -598,7 +618,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 602 "util/configparser.c" /* yacc.c:358 */ +#line 622 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -840,21 +860,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 452 +#define YYLAST 473 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 224 +#define YYNTOKENS 234 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 241 +#define YYNNTS 254 /* YYNRULES -- Number of rules. */ -#define YYNRULES 461 +#define YYNRULES 485 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 692 +#define YYNSTATES 726 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 478 +#define YYMAXUTOK 488 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -910,60 +930,63 @@ static const yytype_uint8 yytranslate[] = 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223 + 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 232, 233 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 157, 157, 157, 158, 158, 159, 159, 160, 160, - 160, 162, 163, 167, 172, 173, 174, 174, 174, 175, - 175, 176, 176, 177, 177, 178, 178, 179, 179, 179, - 180, 180, 180, 181, 181, 182, 182, 183, 183, 184, - 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, - 189, 189, 190, 190, 190, 191, 191, 191, 192, 192, - 193, 193, 194, 194, 195, 195, 196, 196, 196, 197, - 197, 198, 198, 199, 199, 199, 200, 200, 201, 201, - 202, 202, 203, 203, 203, 204, 204, 205, 205, 206, - 206, 207, 207, 208, 208, 209, 209, 209, 210, 210, - 211, 211, 211, 212, 212, 212, 213, 213, 213, 214, - 214, 214, 214, 215, 215, 215, 216, 216, 216, 217, - 217, 218, 218, 219, 219, 220, 220, 221, 221, 221, - 222, 222, 223, 223, 224, 225, 225, 226, 226, 227, - 227, 228, 229, 229, 230, 230, 231, 231, 232, 232, - 232, 233, 233, 234, 234, 235, 235, 236, 236, 237, - 237, 237, 238, 238, 238, 239, 239, 239, 240, 240, - 241, 241, 242, 242, 243, 243, 244, 246, 258, 259, - 260, 260, 260, 260, 260, 261, 263, 275, 276, 277, - 277, 277, 277, 278, 280, 294, 295, 296, 296, 296, - 296, 297, 297, 297, 299, 308, 317, 328, 337, 346, - 355, 366, 375, 386, 399, 414, 425, 442, 459, 472, - 487, 496, 505, 514, 523, 532, 541, 550, 559, 568, - 577, 586, 595, 604, 613, 622, 631, 638, 645, 654, - 663, 672, 686, 695, 704, 713, 720, 727, 753, 761, - 768, 775, 782, 789, 797, 805, 813, 820, 831, 838, - 847, 856, 865, 872, 879, 887, 895, 905, 915, 925, - 938, 949, 957, 970, 979, 988, 997, 1007, 1017, 1025, - 1038, 1047, 1055, 1064, 1072, 1085, 1094, 1101, 1111, 1121, - 1131, 1141, 1151, 1161, 1171, 1181, 1188, 1195, 1202, 1211, - 1220, 1229, 1236, 1246, 1263, 1270, 1288, 1301, 1314, 1323, - 1332, 1341, 1350, 1360, 1370, 1379, 1388, 1401, 1414, 1423, - 1430, 1439, 1448, 1457, 1466, 1474, 1487, 1495, 1523, 1530, - 1545, 1555, 1565, 1572, 1579, 1588, 1602, 1621, 1640, 1652, - 1664, 1676, 1687, 1706, 1716, 1725, 1733, 1741, 1754, 1767, - 1780, 1793, 1802, 1811, 1821, 1831, 1844, 1857, 1868, 1881, - 1892, 1905, 1915, 1922, 1929, 1938, 1948, 1958, 1968, 1975, - 1982, 1991, 2001, 2011, 2040, 2050, 2058, 2067, 2082, 2091, - 2096, 2097, 2098, 2098, 2098, 2099, 2099, 2099, 2100, 2100, - 2102, 2112, 2121, 2128, 2138, 2145, 2152, 2159, 2166, 2171, - 2172, 2173, 2173, 2174, 2174, 2175, 2175, 2176, 2177, 2178, - 2179, 2180, 2181, 2183, 2191, 2198, 2206, 2214, 2221, 2228, - 2237, 2246, 2255, 2264, 2273, 2282, 2287, 2288, 2289, 2291, - 2297, 2307, 2314, 2323, 2331, 2337, 2338, 2340, 2340, 2340, - 2341, 2341, 2342, 2343, 2344, 2345, 2347, 2357, 2367, 2374, - 2381, 2388, 2396, 2409, 2417, 2430, 2435, 2436, 2437, 2437, - 2439, 2453 + 0, 160, 160, 160, 161, 161, 162, 162, 163, 163, + 163, 164, 164, 165, 169, 174, 175, 176, 176, 176, + 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, + 181, 182, 182, 182, 183, 183, 184, 184, 185, 185, + 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, + 191, 191, 191, 192, 192, 192, 193, 193, 193, 194, + 194, 195, 195, 196, 196, 197, 197, 198, 198, 198, + 199, 199, 200, 200, 201, 201, 201, 202, 202, 203, + 203, 204, 204, 205, 205, 205, 206, 206, 207, 207, + 208, 208, 209, 209, 210, 210, 211, 211, 211, 212, + 212, 213, 213, 213, 214, 214, 214, 215, 215, 215, + 216, 216, 216, 216, 217, 217, 217, 218, 218, 218, + 219, 219, 220, 220, 221, 221, 222, 222, 223, 223, + 223, 224, 224, 225, 225, 226, 227, 227, 228, 228, + 229, 229, 230, 231, 231, 232, 232, 233, 233, 234, + 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, + 239, 239, 239, 240, 240, 240, 241, 241, 241, 242, + 242, 243, 243, 244, 244, 245, 245, 246, 246, 247, + 249, 261, 262, 263, 263, 263, 263, 263, 264, 266, + 278, 279, 280, 280, 280, 280, 281, 283, 297, 298, + 299, 299, 299, 299, 300, 300, 300, 302, 318, 319, + 320, 320, 320, 320, 321, 321, 321, 323, 332, 341, + 352, 361, 370, 379, 390, 399, 410, 423, 438, 449, + 466, 483, 496, 511, 520, 529, 538, 547, 556, 565, + 574, 583, 592, 601, 610, 619, 628, 637, 646, 655, + 662, 669, 678, 685, 694, 703, 717, 726, 735, 744, + 751, 758, 784, 792, 799, 806, 813, 820, 828, 836, + 844, 851, 862, 869, 878, 887, 896, 903, 910, 918, + 926, 936, 946, 956, 969, 980, 988, 1001, 1010, 1019, + 1028, 1038, 1048, 1056, 1069, 1078, 1086, 1095, 1103, 1116, + 1125, 1132, 1142, 1152, 1162, 1172, 1182, 1192, 1202, 1212, + 1219, 1226, 1233, 1242, 1251, 1260, 1267, 1277, 1294, 1301, + 1319, 1332, 1345, 1354, 1363, 1372, 1381, 1391, 1401, 1412, + 1421, 1430, 1443, 1456, 1465, 1472, 1481, 1490, 1499, 1508, + 1516, 1529, 1537, 1566, 1573, 1588, 1598, 1608, 1615, 1622, + 1631, 1645, 1664, 1683, 1695, 1707, 1719, 1730, 1749, 1759, + 1768, 1776, 1784, 1797, 1810, 1823, 1836, 1845, 1854, 1864, + 1874, 1887, 1900, 1911, 1924, 1935, 1948, 1958, 1965, 1972, + 1981, 1991, 2001, 2011, 2018, 2025, 2034, 2044, 2054, 2061, + 2068, 2075, 2085, 2095, 2105, 2115, 2145, 2155, 2163, 2172, + 2187, 2196, 2201, 2202, 2203, 2203, 2203, 2204, 2204, 2204, + 2205, 2205, 2207, 2217, 2226, 2233, 2243, 2250, 2257, 2264, + 2271, 2276, 2277, 2278, 2278, 2279, 2279, 2280, 2280, 2281, + 2282, 2283, 2284, 2285, 2286, 2288, 2296, 2303, 2311, 2319, + 2326, 2333, 2342, 2351, 2360, 2369, 2378, 2387, 2392, 2393, + 2394, 2396, 2402, 2412, 2419, 2428, 2436, 2442, 2443, 2445, + 2445, 2445, 2446, 2446, 2447, 2448, 2449, 2450, 2451, 2453, + 2463, 2473, 2480, 2489, 2496, 2505, 2513, 2526, 2534, 2547, + 2552, 2553, 2554, 2554, 2556, 2570 }; #endif @@ -1014,12 +1037,13 @@ static const char *const yytname[] = "VAR_LOG_REPLIES", "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM", "VAR_FORWARD_SSL_UPSTREAM", - "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", - "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", - "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", - "VAR_DNS64_SYNTHALL", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", - "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_SEND_IDENTITY", - "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", + "VAR_TLS_CERT_BUNDLE", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", + "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", + "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", + "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", + "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", + "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION", + "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES", "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES", "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES", @@ -1043,23 +1067,27 @@ static const char *const yytname[] = "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", - "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_DNSCRYPT", - "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", - "VAR_DNSCRYPT_SECRET_KEY", "VAR_DNSCRYPT_PROVIDER_CERT", + "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", + "VAR_SHM_KEY", "VAR_DNSCRYPT", "VAR_DNSCRYPT_ENABLE", + "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", "VAR_DNSCRYPT_SECRET_KEY", + "VAR_DNSCRYPT_PROVIDER_CERT", "VAR_DNSCRYPT_PROVIDER_CERT_ROTATED", "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE", "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS", "VAR_DNSCRYPT_NONCE_CACHE_SIZE", "VAR_DNSCRYPT_NONCE_CACHE_SLABS", "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS", "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT", "VAR_CACHEDB", "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED", - "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "$accept", "toplevelvars", + "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "VAR_FOR_UPSTREAM", + "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER", "VAR_URL", + "VAR_FOR_DOWNSTREAM", "VAR_FALLBACK_ENABLED", "$accept", "toplevelvars", "toplevelvar", "serverstart", "contents_server", "content_server", "stubstart", "contents_stub", "content_stub", "forwardstart", "contents_forward", "content_forward", "viewstart", "contents_view", - "content_view", "server_num_threads", "server_verbosity", - "server_statistics_interval", "server_statistics_cumulative", - "server_extended_statistics", "server_shm_enable", "server_shm_key", - "server_port", "server_send_client_subnet", "server_client_subnet_zone", + "content_view", "authstart", "contents_auth", "content_auth", + "server_num_threads", "server_verbosity", "server_statistics_interval", + "server_statistics_cumulative", "server_extended_statistics", + "server_shm_enable", "server_shm_key", "server_port", + "server_send_client_subnet", "server_client_subnet_zone", "server_client_subnet_always_forward", "server_client_subnet_opcode", "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6", "server_interface", "server_outgoing_interface", "server_outgoing_range", @@ -1070,17 +1098,18 @@ static const char *const yytname[] = "server_outgoing_tcp_mss", "server_tcp_upstream", "server_udp_upstream_without_downstream", "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", - "server_use_systemd", "server_do_daemonize", "server_use_syslog", - "server_log_time_ascii", "server_log_queries", "server_log_replies", - "server_chroot", "server_username", "server_directory", "server_logfile", - "server_pidfile", "server_root_hints", "server_dlv_anchor_file", - "server_dlv_anchor", "server_auto_trust_anchor_file", - "server_trust_anchor_file", "server_trusted_keys_file", - "server_trust_anchor", "server_trust_anchor_signaling", - "server_domain_insecure", "server_hide_identity", "server_hide_version", - "server_hide_trustanchor", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", - "server_ip_transparent", "server_ip_freebind", "server_edns_buffer_size", + "server_tls_cert_bundle", "server_use_systemd", "server_do_daemonize", + "server_use_syslog", "server_log_time_ascii", "server_log_queries", + "server_log_replies", "server_chroot", "server_username", + "server_directory", "server_logfile", "server_pidfile", + "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", + "server_auto_trust_anchor_file", "server_trust_anchor_file", + "server_trusted_keys_file", "server_trust_anchor", + "server_trust_anchor_signaling", "server_domain_insecure", + "server_hide_identity", "server_hide_version", "server_hide_trustanchor", + "server_identity", "server_version", "server_so_rcvbuf", + "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent", + "server_ip_freebind", "server_edns_buffer_size", "server_msg_buffer_size", "server_msg_cache_size", "server_msg_cache_slabs", "server_num_queries_per_thread", "server_jostle_timeout", "server_delay_close", @@ -1102,10 +1131,11 @@ static const char *const yytname[] = "server_val_sig_skew_max", "server_cache_max_ttl", "server_cache_max_negative_ttl", "server_cache_min_ttl", "server_bogus_ttl", "server_val_clean_additional", - "server_val_permissive_mode", "server_ignore_cd_flag", - "server_serve_expired", "server_fake_dsa", "server_fake_sha1", - "server_val_log_level", "server_val_nsec3_keysize_iterations", - "server_add_holddown", "server_del_holddown", "server_keep_missing", + "server_val_permissive_mode", "server_aggressive_nsec", + "server_ignore_cd_flag", "server_serve_expired", "server_fake_dsa", + "server_fake_sha1", "server_val_log_level", + "server_val_nsec3_keysize_iterations", "server_add_holddown", + "server_del_holddown", "server_keep_missing", "server_permit_small_holddown", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "server_minimal_responses", @@ -1125,6 +1155,8 @@ static const char *const yytname[] = "server_ipsecmod_strict", "stub_name", "stub_host", "stub_addr", "stub_first", "stub_ssl_upstream", "stub_prime", "forward_name", "forward_host", "forward_addr", "forward_first", "forward_ssl_upstream", + "auth_name", "auth_zonefile", "auth_master", "auth_url", + "auth_for_downstream", "auth_for_upstream", "auth_fallback_enabled", "view_name", "view_local_zone", "view_response_ip", "view_response_ip_data", "view_local_data", "view_local_data_ptr", "view_first", "rcstart", "contents_rc", "content_rc", @@ -1145,8 +1177,8 @@ static const char *const yytname[] = "server_response_ip", "server_response_ip_data", "dnscstart", "contents_dnsc", "content_dnsc", "dnsc_dnscrypt_enable", "dnsc_dnscrypt_port", "dnsc_dnscrypt_provider", - "dnsc_dnscrypt_provider_cert", "dnsc_dnscrypt_secret_key", - "dnsc_dnscrypt_shared_secret_cache_size", + "dnsc_dnscrypt_provider_cert", "dnsc_dnscrypt_provider_cert_rotated", + "dnsc_dnscrypt_secret_key", "dnsc_dnscrypt_shared_secret_cache_size", "dnsc_dnscrypt_shared_secret_cache_slabs", "dnsc_dnscrypt_nonce_cache_size", "dnsc_dnscrypt_nonce_cache_slabs", "cachedbstart", "contents_cachedb", "content_cachedb", @@ -1181,14 +1213,15 @@ static const yytype_uint16 yytoknum[] = 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, - 475, 476, 477, 478 + 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, + 485, 486, 487, 488 }; # endif -#define YYPACT_NINF -215 +#define YYPACT_NINF -223 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-215))) + (!!((Yystate) == (-223))) #define YYTABLE_NINF -1 @@ -1199,76 +1232,79 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -215, 0, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, 209, -38, -34, -39, -44, -130, -105, -177, - -214, -1, 2, 3, 29, 30, 32, 33, 34, 35, - 36, 46, 47, 48, 49, 50, 51, 53, 54, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 82, 83, 84, 86, 89, 91, - 92, 93, 94, 95, 96, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, - 239, 240, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, 241, 242, 246, 247, 248, 290, - -215, -215, -215, -215, -215, -215, -215, 291, 292, 293, - 294, 295, -215, -215, -215, -215, -215, -215, 296, 297, - 298, 302, 306, 307, 331, -215, -215, -215, -215, -215, - -215, -215, -215, 332, 333, 334, 344, 345, 346, 347, - 348, -215, -215, -215, -215, -215, -215, -215, -215, -215, - 349, 350, 351, 352, 353, 354, 355, 356, 391, 393, - 403, 404, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, 405, -215, -215, 406, 407, - 408, 409, 410, 411, 412, 419, 420, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, 421, 423, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, 424, 425, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, 426, 427, 428, -215, -215, -215, -215, -215, - -215, -215, -215, -215, 429, 430, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, 431, 432, 433, 434, 435, 436, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, 437, -215, -215, 438, 439, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, 440, 441, 442, -215, -215, -215, -215, -215, - -215, -215 + -223, 0, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, 217, -36, -31, -39, -35, -24, + -128, -100, -159, -222, 2, 3, 4, 5, 6, 21, + 22, 23, 24, 25, 26, 29, 30, 32, 33, 34, + 35, 36, 48, 49, 50, 51, 53, 54, 55, 56, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 82, 83, 84, 85, 86, + 88, 89, 92, 94, 95, 96, 98, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 189, 190, 191, 192, + 193, 194, 195, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 214, + 215, 216, 247, 248, 249, 250, 254, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, 255, 256, 298, 299, 300, 301, -223, -223, -223, + -223, -223, -223, -223, 302, 303, 304, 305, 306, -223, + -223, -223, -223, -223, -223, 310, 314, 315, 339, 340, + 341, 343, -223, -223, -223, -223, -223, -223, -223, -223, + 353, 354, 355, 356, 357, 358, 359, -223, -223, -223, + -223, -223, -223, -223, -223, 360, 361, 362, 363, 364, + 365, 400, 402, -223, -223, -223, -223, -223, -223, -223, + -223, -223, 413, 414, 415, 416, 417, 418, 419, 420, + 421, 422, 423, 430, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, 431, -223, -223, + 432, 434, 435, 436, 437, 438, 439, 440, 441, 442, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, 443, 444, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, 445, 446, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, 447, 448, 449, + -223, -223, -223, -223, -223, -223, -223, -223, -223, 450, + 451, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, 452, 453, 454, 455, + 456, 457, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, 458, -223, -223, 459, 460, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, 461, 462, 463, -223, + -223, -223, -223, -223, -223, -223 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1276,10 +1312,10 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 13, 177, 186, 379, 425, 398, 194, - 434, 455, 3, 15, 179, 188, 196, 381, 400, 427, - 436, 457, 4, 5, 6, 10, 8, 9, 7, 11, - 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 1, 14, 180, 189, 401, 447, 420, 197, + 456, 479, 207, 3, 16, 182, 191, 199, 209, 403, + 422, 449, 458, 481, 4, 5, 6, 10, 13, 8, + 9, 7, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1295,117 +1331,122 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 14, 16, 17, 76, 79, 88, 165, 166, - 18, 138, 139, 140, 141, 142, 143, 27, 67, 19, - 80, 81, 38, 60, 75, 20, 21, 23, 24, 22, - 25, 26, 111, 176, 112, 113, 114, 115, 161, 77, - 66, 92, 109, 110, 28, 29, 30, 31, 32, 68, - 82, 83, 98, 54, 64, 55, 169, 93, 48, 49, - 168, 50, 51, 102, 106, 119, 127, 148, 103, 61, - 33, 34, 35, 90, 120, 121, 122, 36, 37, 39, - 40, 42, 43, 41, 125, 44, 45, 46, 52, 71, - 107, 85, 126, 78, 144, 86, 87, 104, 105, 91, - 47, 69, 72, 53, 56, 94, 95, 70, 145, 96, - 57, 58, 59, 108, 158, 159, 167, 97, 65, 99, - 100, 101, 146, 62, 63, 84, 73, 74, 89, 116, - 117, 118, 123, 124, 149, 150, 152, 154, 155, 153, - 156, 162, 128, 129, 132, 133, 130, 131, 134, 135, - 137, 136, 147, 157, 170, 172, 171, 173, 174, 175, - 151, 160, 163, 164, 0, 0, 0, 0, 0, 0, - 178, 180, 181, 182, 184, 185, 183, 0, 0, 0, - 0, 0, 187, 189, 190, 191, 192, 193, 0, 0, - 0, 0, 0, 0, 0, 195, 197, 198, 201, 202, - 199, 203, 200, 0, 0, 0, 0, 0, 0, 0, - 0, 380, 382, 384, 383, 389, 385, 386, 387, 388, + 0, 0, 0, 0, 0, 0, 0, 15, 17, 18, + 77, 80, 89, 166, 167, 19, 139, 140, 141, 142, + 143, 144, 28, 68, 20, 81, 82, 39, 61, 76, + 21, 22, 24, 25, 23, 26, 27, 112, 177, 113, + 114, 115, 116, 179, 162, 78, 67, 93, 110, 111, + 29, 30, 31, 32, 33, 69, 83, 84, 99, 55, + 65, 56, 170, 94, 49, 50, 169, 51, 52, 103, + 107, 120, 128, 149, 104, 62, 34, 35, 36, 91, + 121, 122, 123, 37, 38, 40, 41, 43, 44, 42, + 126, 45, 46, 47, 53, 72, 108, 86, 127, 79, + 145, 87, 88, 105, 106, 92, 48, 70, 73, 54, + 57, 95, 96, 71, 146, 97, 58, 59, 60, 178, + 109, 159, 160, 168, 98, 66, 100, 101, 102, 147, + 63, 64, 85, 74, 75, 90, 117, 118, 119, 124, + 125, 150, 151, 153, 155, 156, 154, 157, 163, 129, + 130, 133, 134, 131, 132, 135, 136, 138, 137, 148, + 158, 171, 173, 172, 174, 175, 176, 152, 161, 164, + 165, 0, 0, 0, 0, 0, 0, 181, 183, 184, + 185, 187, 188, 186, 0, 0, 0, 0, 0, 190, + 192, 193, 194, 195, 196, 0, 0, 0, 0, 0, + 0, 0, 198, 200, 201, 204, 205, 202, 206, 203, + 0, 0, 0, 0, 0, 0, 0, 208, 210, 211, + 212, 213, 214, 215, 216, 0, 0, 0, 0, 0, + 0, 0, 0, 402, 404, 406, 405, 411, 407, 408, + 409, 410, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 421, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 0, 448, 450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 399, 401, 402, 403, 404, 405, 406, 407, - 408, 409, 410, 411, 412, 0, 426, 428, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 435, 437, 438, - 439, 441, 440, 442, 443, 444, 445, 0, 0, 456, - 458, 459, 205, 204, 211, 220, 218, 226, 227, 230, - 228, 229, 231, 232, 245, 246, 247, 248, 249, 271, - 272, 273, 278, 279, 223, 280, 281, 284, 282, 283, - 286, 287, 288, 301, 259, 260, 262, 263, 289, 304, - 254, 256, 305, 311, 312, 313, 224, 270, 324, 325, - 255, 319, 241, 219, 250, 302, 308, 290, 0, 0, - 328, 225, 206, 240, 294, 207, 221, 222, 251, 252, - 326, 292, 296, 297, 208, 329, 274, 300, 242, 258, - 306, 307, 310, 318, 253, 322, 320, 321, 264, 269, - 298, 299, 265, 266, 291, 314, 243, 244, 233, 235, - 236, 237, 238, 330, 331, 332, 275, 276, 277, 285, - 333, 334, 0, 0, 0, 293, 267, 430, 343, 347, - 345, 344, 348, 346, 0, 0, 351, 352, 212, 213, - 214, 215, 216, 217, 295, 309, 323, 353, 354, 268, - 335, 0, 0, 0, 0, 0, 0, 315, 316, 317, - 431, 261, 257, 239, 209, 210, 355, 357, 356, 358, - 359, 360, 234, 361, 362, 363, 366, 365, 364, 367, - 368, 369, 370, 371, 372, 0, 376, 377, 0, 0, - 378, 390, 392, 391, 394, 395, 396, 397, 393, 413, - 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, - 424, 429, 446, 447, 448, 450, 449, 451, 452, 453, - 454, 460, 461, 303, 327, 342, 432, 433, 349, 350, - 336, 337, 0, 0, 0, 341, 373, 374, 375, 340, - 338, 339 + 457, 459, 460, 461, 463, 464, 462, 465, 466, 467, + 468, 0, 0, 480, 482, 483, 218, 217, 224, 233, + 231, 239, 240, 243, 241, 242, 244, 245, 259, 260, + 261, 262, 263, 285, 286, 287, 292, 293, 236, 294, + 295, 298, 296, 297, 300, 301, 302, 315, 273, 274, + 276, 277, 303, 318, 268, 270, 319, 325, 326, 327, + 237, 284, 339, 340, 269, 334, 255, 232, 264, 316, + 322, 304, 0, 0, 343, 238, 219, 254, 308, 220, + 234, 235, 265, 266, 341, 306, 310, 311, 221, 344, + 288, 314, 256, 272, 320, 321, 324, 333, 267, 337, + 335, 336, 278, 283, 312, 313, 279, 280, 305, 329, + 257, 258, 246, 248, 249, 250, 251, 252, 345, 346, + 347, 289, 290, 291, 299, 348, 349, 0, 0, 0, + 307, 281, 452, 358, 362, 360, 359, 363, 361, 0, + 0, 366, 367, 225, 226, 227, 228, 229, 230, 309, + 323, 338, 368, 369, 282, 350, 0, 0, 0, 0, + 0, 0, 330, 331, 332, 453, 275, 271, 328, 253, + 222, 223, 370, 372, 371, 373, 374, 375, 247, 376, + 377, 378, 381, 380, 379, 382, 383, 384, 385, 386, + 394, 0, 398, 399, 0, 0, 400, 387, 392, 388, + 389, 390, 391, 393, 412, 414, 413, 416, 417, 418, + 419, 415, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 444, 445, 446, 451, 469, 470, 471, 474, 472, + 473, 475, 476, 477, 478, 484, 485, 317, 342, 357, + 454, 455, 364, 365, 351, 352, 0, 0, 0, 356, + 395, 396, 397, 355, 353, 354 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215, -215, -215, -215, -215, -215, -215, -215, -215, -215, - -215 + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 12, 13, 22, 192, 14, 23, 360, 15, - 24, 372, 16, 25, 385, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, - 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, - 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, - 348, 349, 361, 362, 363, 364, 365, 366, 373, 374, - 375, 376, 377, 386, 387, 388, 389, 390, 391, 392, - 17, 26, 401, 402, 403, 404, 405, 406, 407, 408, - 409, 18, 27, 422, 423, 424, 425, 426, 427, 428, - 429, 430, 431, 432, 433, 434, 19, 28, 436, 437, - 350, 351, 352, 353, 20, 29, 447, 448, 449, 450, - 451, 452, 453, 454, 455, 456, 21, 30, 459, 460, - 461 + -1, 1, 13, 14, 24, 197, 15, 25, 367, 16, + 26, 379, 17, 27, 392, 18, 28, 407, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, + 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, + 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, + 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, + 350, 351, 352, 353, 354, 355, 356, 368, 369, 370, + 371, 372, 373, 380, 381, 382, 383, 384, 408, 409, + 410, 411, 412, 413, 414, 393, 394, 395, 396, 397, + 398, 399, 19, 29, 423, 424, 425, 426, 427, 428, + 429, 430, 431, 20, 30, 444, 445, 446, 447, 448, + 449, 450, 451, 452, 453, 454, 455, 456, 21, 31, + 458, 459, 357, 358, 359, 360, 22, 32, 470, 471, + 472, 473, 474, 475, 476, 477, 478, 479, 480, 23, + 33, 483, 484, 485 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1413,155 +1454,162 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 378, 354, 435, 355, 356, 367, 457, 458, 462, - 0, 3, 463, 464, 368, 369, 410, 411, 412, 413, - 414, 415, 416, 417, 418, 419, 420, 421, 438, 439, - 440, 441, 442, 443, 444, 445, 446, 379, 380, 465, - 466, 4, 467, 468, 469, 470, 471, 5, 393, 394, - 395, 396, 397, 398, 399, 400, 472, 473, 474, 475, - 476, 477, 381, 478, 479, 357, 480, 481, 482, 483, - 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 6, 505, 506, 507, 358, 508, 359, 370, 509, - 371, 510, 511, 512, 513, 514, 515, 7, 516, 517, - 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, - 382, 383, 528, 529, 530, 531, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 548, 549, 550, 8, 551, 552, 553, 554, - 555, 556, 557, 558, 559, 384, 560, 561, 562, 563, - 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, - 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, - 584, 585, 586, 587, 588, 589, 590, 591, 592, 593, - 594, 595, 9, 596, 597, 598, 599, 600, 601, 602, - 603, 604, 605, 606, 10, 607, 608, 609, 610, 611, - 612, 613, 614, 615, 616, 617, 618, 619, 620, 0, - 11, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 621, - 622, 623, 624, 59, 60, 61, 625, 626, 627, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 628, 629, 630, 631, 632, 633, 634, 635, 636, 103, - 104, 105, 637, 106, 107, 108, 638, 639, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 640, 641, 642, 643, 132, 133, 134, 135, 136, - 137, 138, 139, 140, 644, 645, 646, 647, 648, 649, - 650, 651, 652, 653, 654, 655, 656, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 657, 175, 658, 176, 177, 178, 179, 180, 181, - 182, 183, 184, 659, 660, 661, 662, 663, 664, 665, - 666, 667, 668, 185, 186, 187, 188, 189, 190, 669, - 670, 671, 191, 672, 673, 674, 675, 676, 677, 678, - 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, - 689, 690, 691 + 2, 385, 481, 482, 361, 400, 362, 363, 457, 374, + 0, 3, 486, 487, 488, 489, 490, 375, 376, 432, + 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, + 443, 491, 492, 493, 494, 495, 496, 386, 387, 497, + 498, 4, 499, 500, 501, 502, 503, 5, 460, 461, + 462, 463, 464, 465, 466, 467, 468, 469, 504, 505, + 506, 507, 388, 508, 509, 510, 511, 364, 415, 416, + 417, 418, 419, 420, 421, 422, 512, 513, 514, 515, + 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, + 526, 6, 527, 528, 529, 530, 531, 365, 532, 533, + 366, 377, 534, 378, 535, 536, 537, 7, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, + 550, 389, 390, 551, 552, 553, 554, 555, 556, 557, + 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, + 568, 569, 570, 571, 572, 573, 8, 574, 575, 576, + 577, 578, 579, 580, 581, 582, 391, 583, 584, 585, + 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, + 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, + 616, 617, 401, 9, 402, 403, 404, 405, 406, 618, + 619, 620, 621, 622, 623, 624, 10, 625, 626, 627, + 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, + 638, 639, 640, 11, 641, 642, 643, 0, 12, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 644, 645, 646, + 647, 62, 63, 64, 648, 649, 650, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 651, 652, + 653, 654, 655, 656, 657, 658, 659, 106, 107, 108, + 660, 109, 110, 111, 661, 662, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 663, + 664, 665, 135, 666, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 667, 668, 669, 670, 671, 672, 673, + 674, 675, 676, 677, 678, 679, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 680, 179, 681, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 682, 683, 684, 685, 686, 687, 688, + 689, 690, 691, 692, 190, 191, 192, 193, 194, 195, + 693, 694, 695, 196, 696, 697, 698, 699, 700, 701, + 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, + 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, + 722, 723, 724, 725 }; static const yytype_int16 yycheck[] = { - 0, 40, 40, 108, 42, 43, 40, 221, 222, 10, - -1, 11, 10, 10, 48, 49, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 76, 77, 10, - 10, 41, 10, 10, 10, 10, 10, 47, 92, 93, + 0, 40, 224, 225, 40, 40, 42, 43, 108, 40, + -1, 11, 10, 10, 10, 10, 10, 48, 49, 147, + 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, + 158, 10, 10, 10, 10, 10, 10, 76, 77, 10, + 10, 41, 10, 10, 10, 10, 10, 47, 207, 208, + 209, 210, 211, 212, 213, 214, 215, 216, 10, 10, + 10, 10, 101, 10, 10, 10, 10, 103, 92, 93, 94, 95, 96, 97, 98, 99, 10, 10, 10, 10, - 10, 10, 101, 10, 10, 103, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 91, 10, 10, 10, 10, 10, 133, 10, 10, + 136, 132, 10, 134, 10, 10, 10, 107, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 10, 133, 10, 135, 132, 10, - 134, 10, 10, 10, 10, 10, 10, 107, 10, 10, + 10, 160, 161, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 146, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 195, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 145, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 194, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 227, 193, 229, 230, 231, 232, 233, 10, + 10, 10, 10, 10, 10, 10, 206, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 192, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 204, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, -1, - 220, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 10, - 10, 10, 10, 44, 45, 46, 10, 10, 10, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 100, - 101, 102, 10, 104, 105, 106, 10, 10, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 10, 10, 10, 10, 136, 137, 138, 139, 140, - 141, 142, 143, 144, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 158, 159, 160, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 10, 193, 10, 195, 196, 197, 198, 199, 200, - 201, 202, 203, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 214, 215, 216, 217, 218, 219, 10, - 10, 10, 223, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 223, 10, 10, 10, -1, 228, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 10, 10, 10, + 10, 44, 45, 46, 10, 10, 10, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 100, 101, 102, + 10, 104, 105, 106, 10, 10, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 10, + 10, 10, 135, 10, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 10, 194, 10, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 217, 218, 219, 220, 221, 222, + 10, 10, 10, 226, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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_uint16 yystos[] = { - 0, 225, 0, 11, 41, 47, 91, 107, 145, 192, - 204, 220, 226, 227, 230, 233, 236, 414, 425, 440, - 448, 460, 228, 231, 234, 237, 415, 426, 441, 449, - 461, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 44, - 45, 46, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 100, 101, 102, 104, 105, 106, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 193, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 214, 215, 216, 217, 218, - 219, 223, 229, 239, 240, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, - 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, - 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, - 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, - 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, - 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, - 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, - 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, - 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, - 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, - 444, 445, 446, 447, 40, 42, 43, 103, 133, 135, - 232, 396, 397, 398, 399, 400, 401, 40, 48, 49, - 132, 134, 235, 402, 403, 404, 405, 406, 40, 76, - 77, 101, 159, 160, 194, 238, 407, 408, 409, 410, - 411, 412, 413, 92, 93, 94, 95, 96, 97, 98, - 99, 416, 417, 418, 419, 420, 421, 422, 423, 424, - 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 438, 439, 108, 442, 443, 205, 206, - 207, 208, 209, 210, 211, 212, 213, 450, 451, 452, - 453, 454, 455, 456, 457, 458, 459, 221, 222, 462, - 463, 464, 10, 10, 10, 10, 10, 10, 10, 10, + 0, 235, 0, 11, 41, 47, 91, 107, 146, 193, + 206, 223, 228, 236, 237, 240, 243, 246, 249, 436, + 447, 462, 470, 483, 238, 241, 244, 247, 250, 437, + 448, 463, 471, 484, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 44, 45, 46, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 100, 101, 102, 104, + 105, 106, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 135, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 194, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, + 217, 218, 219, 220, 221, 222, 226, 239, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, + 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, + 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, + 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, + 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, + 404, 405, 406, 407, 408, 409, 410, 466, 467, 468, + 469, 40, 42, 43, 103, 133, 136, 242, 411, 412, + 413, 414, 415, 416, 40, 48, 49, 132, 134, 245, + 417, 418, 419, 420, 421, 40, 76, 77, 101, 160, + 161, 195, 248, 429, 430, 431, 432, 433, 434, 435, + 40, 227, 229, 230, 231, 232, 233, 251, 422, 423, + 424, 425, 426, 427, 428, 92, 93, 94, 95, 96, + 97, 98, 99, 438, 439, 440, 441, 442, 443, 444, + 445, 446, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 449, 450, 451, 452, 453, 454, + 455, 456, 457, 458, 459, 460, 461, 108, 464, 465, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, + 482, 224, 225, 485, 486, 487, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1584,34 +1632,34 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10 + 10, 10, 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 224, 225, 225, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 227, 228, 228, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 230, 231, 231, - 232, 232, 232, 232, 232, 232, 233, 234, 234, 235, - 235, 235, 235, 235, 236, 237, 237, 238, 238, 238, - 238, 238, 238, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, + 0, 234, 235, 235, 236, 236, 236, 236, 236, 236, + 236, 236, 236, 236, 237, 238, 238, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 240, 241, 241, 242, 242, 242, 242, 242, 242, 243, + 244, 244, 245, 245, 245, 245, 245, 246, 247, 247, + 248, 248, 248, 248, 248, 248, 248, 249, 250, 250, + 251, 251, 251, 251, 251, 251, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, @@ -1628,22 +1676,25 @@ static const yytype_uint16 yyr1[] = 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 415, 416, 416, 416, 416, 416, 416, 416, 416, - 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, - 426, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 438, 439, 440, 441, 441, 442, 443, - 444, 445, 446, 447, 448, 449, 449, 450, 450, 450, - 450, 450, 450, 450, 450, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 461, 462, 462, - 463, 464 + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, + 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, + 435, 436, 437, 437, 438, 438, 438, 438, 438, 438, + 438, 438, 439, 440, 441, 442, 443, 444, 445, 446, + 447, 448, 448, 449, 449, 449, 449, 449, 449, 449, + 449, 449, 449, 449, 449, 450, 451, 452, 453, 454, + 455, 456, 457, 458, 459, 460, 461, 462, 463, 463, + 464, 465, 466, 467, 468, 469, 470, 471, 471, 472, + 472, 472, 472, 472, 472, 472, 472, 472, 472, 473, + 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, + 484, 484, 485, 485, 486, 487 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, + 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1659,10 +1710,10 @@ 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, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 2, 0, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1672,23 +1723,24 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 3, 4, 4, - 4, 3, 3, 2, 2, 2, 2, 2, 2, 3, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 3, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 0, 1, 2, - 2, 2, 3, 3, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, - 2, 2 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 4, 4, 4, 3, 3, 2, 2, + 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 3, 3, 3, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, + 1, 2, 2, 2, 3, 3, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, + 2, 0, 1, 1, 2, 2 }; @@ -2364,16 +2416,16 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 13: -#line 168 "util/configparser.y" /* yacc.c:1646 */ + case 14: +#line 170 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2373 "util/configparser.c" /* yacc.c:1646 */ +#line 2425 "util/configparser.c" /* yacc.c:1646 */ break; - case 177: -#line 247 "util/configparser.y" /* yacc.c:1646 */ + case 180: +#line 250 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2384,11 +2436,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2388 "util/configparser.c" /* yacc.c:1646 */ +#line 2440 "util/configparser.c" /* yacc.c:1646 */ break; - case 186: -#line 264 "util/configparser.y" /* yacc.c:1646 */ + case 189: +#line 267 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2399,11 +2451,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2403 "util/configparser.c" /* yacc.c:1646 */ +#line 2455 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: -#line 281 "util/configparser.y" /* yacc.c:1646 */ + case 197: +#line 284 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2416,11 +2468,30 @@ yyreduce: } else yyerror("out of memory"); } -#line 2420 "util/configparser.c" /* yacc.c:1646 */ +#line 2472 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 207: +#line 303 "util/configparser.y" /* yacc.c:1646 */ + { + struct config_auth* s; + OUTYY(("\nP(auth_zone:)\n")); + s = (struct config_auth*)calloc(1, sizeof(struct config_auth)); + if(s) { + s->next = cfg_parser->cfg->auths; + cfg_parser->cfg->auths = s; + /* defaults for auth zone */ + s->for_downstream = 1; + s->for_upstream = 1; + s->fallback_enabled = 0; + } else + yyerror("out of memory"); + } +#line 2491 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 300 "util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 324 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2428,11 +2499,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2432 "util/configparser.c" /* yacc.c:1646 */ +#line 2503 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 309 "util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 333 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2440,11 +2511,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2444 "util/configparser.c" /* yacc.c:1646 */ +#line 2515 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 318 "util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 342 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2454,11 +2525,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2458 "util/configparser.c" /* yacc.c:1646 */ +#line 2529 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 329 "util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 353 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2466,11 +2537,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2470 "util/configparser.c" /* yacc.c:1646 */ +#line 2541 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 338 "util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 362 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2478,11 +2549,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2482 "util/configparser.c" /* yacc.c:1646 */ +#line 2553 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 347 "util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 371 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2490,11 +2561,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2494 "util/configparser.c" /* yacc.c:1646 */ +#line 2565 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 356 "util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 380 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2504,11 +2575,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2508 "util/configparser.c" /* yacc.c:1646 */ +#line 2579 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 367 "util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 391 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2516,11 +2587,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2520 "util/configparser.c" /* yacc.c:1646 */ +#line 2591 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 376 "util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 400 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2530,11 +2601,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2534 "util/configparser.c" /* yacc.c:1646 */ +#line 2605 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 387 "util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 411 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2545,11 +2616,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2549 "util/configparser.c" /* yacc.c:1646 */ +#line 2620 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 400 "util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 424 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2563,11 +2634,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2567 "util/configparser.c" /* yacc.c:1646 */ +#line 2638 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 415 "util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 439 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2577,11 +2648,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2581 "util/configparser.c" /* yacc.c:1646 */ +#line 2652 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 426 "util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 450 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2597,11 +2668,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2601 "util/configparser.c" /* yacc.c:1646 */ +#line 2672 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 443 "util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 467 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2617,11 +2688,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2621 "util/configparser.c" /* yacc.c:1646 */ +#line 2692 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 460 "util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 484 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2633,11 +2704,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2637 "util/configparser.c" /* yacc.c:1646 */ +#line 2708 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 473 "util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 497 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2651,11 +2722,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2655 "util/configparser.c" /* yacc.c:1646 */ +#line 2726 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 488 "util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 512 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2663,11 +2734,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2667 "util/configparser.c" /* yacc.c:1646 */ +#line 2738 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 497 "util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 521 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2675,11 +2746,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2679 "util/configparser.c" /* yacc.c:1646 */ +#line 2750 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 506 "util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 530 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2687,11 +2758,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2691 "util/configparser.c" /* yacc.c:1646 */ +#line 2762 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 515 "util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 539 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2699,11 +2770,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2703 "util/configparser.c" /* yacc.c:1646 */ +#line 2774 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 524 "util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 548 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2711,11 +2782,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2715 "util/configparser.c" /* yacc.c:1646 */ +#line 2786 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 533 "util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 557 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2723,11 +2794,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2727 "util/configparser.c" /* yacc.c:1646 */ +#line 2798 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 542 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 566 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2735,11 +2806,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2739 "util/configparser.c" /* yacc.c:1646 */ +#line 2810 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 551 "util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 575 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2747,11 +2818,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2751 "util/configparser.c" /* yacc.c:1646 */ +#line 2822 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 560 "util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 584 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2759,11 +2830,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2763 "util/configparser.c" /* yacc.c:1646 */ +#line 2834 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 569 "util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 593 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2771,11 +2842,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2775 "util/configparser.c" /* yacc.c:1646 */ +#line 2846 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 578 "util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 602 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2783,11 +2854,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2787 "util/configparser.c" /* yacc.c:1646 */ +#line 2858 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 587 "util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 611 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2795,11 +2866,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2799 "util/configparser.c" /* yacc.c:1646 */ +#line 2870 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 596 "util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 620 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2807,11 +2878,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2811 "util/configparser.c" /* yacc.c:1646 */ +#line 2882 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 605 "util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 629 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2819,11 +2890,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2823 "util/configparser.c" /* yacc.c:1646 */ +#line 2894 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 614 "util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 638 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2831,11 +2902,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2835 "util/configparser.c" /* yacc.c:1646 */ +#line 2906 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 623 "util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 647 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2843,31 +2914,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2847 "util/configparser.c" /* yacc.c:1646 */ +#line 2918 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 632 "util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 656 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 2857 "util/configparser.c" /* yacc.c:1646 */ +#line 2928 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 639 "util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 663 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 2867 "util/configparser.c" /* yacc.c:1646 */ +#line 2938 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 646 "util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 670 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2875,11 +2946,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2879 "util/configparser.c" /* yacc.c:1646 */ +#line 2950 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 655 "util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 679 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str))); + free(cfg_parser->cfg->tls_cert_bundle); + cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str); + } +#line 2960 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 253: +#line 686 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2887,11 +2968,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2891 "util/configparser.c" /* yacc.c:1646 */ +#line 2972 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 664 "util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 695 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2899,11 +2980,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2903 "util/configparser.c" /* yacc.c:1646 */ +#line 2984 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 673 "util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 704 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2916,11 +2997,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2920 "util/configparser.c" /* yacc.c:1646 */ +#line 3001 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 687 "util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 718 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2928,11 +3009,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2932 "util/configparser.c" /* yacc.c:1646 */ +#line 3013 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 696 "util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 727 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2940,11 +3021,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2944 "util/configparser.c" /* yacc.c:1646 */ +#line 3025 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 705 "util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 736 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2952,31 +3033,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2956 "util/configparser.c" /* yacc.c:1646 */ +#line 3037 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 714 "util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 745 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 2966 "util/configparser.c" /* yacc.c:1646 */ +#line 3047 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 721 "util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 752 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 2976 "util/configparser.c" /* yacc.c:1646 */ +#line 3057 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 728 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 759 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3001,105 +3082,105 @@ yyreduce: } } } -#line 3005 "util/configparser.c" /* yacc.c:1646 */ +#line 3086 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 754 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 785 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 3016 "util/configparser.c" /* yacc.c:1646 */ +#line 3097 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 762 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 793 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3026 "util/configparser.c" /* yacc.c:1646 */ +#line 3107 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 769 "util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 800 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3036 "util/configparser.c" /* yacc.c:1646 */ +#line 3117 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 776 "util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 807 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3046 "util/configparser.c" /* yacc.c:1646 */ +#line 3127 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 783 "util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 814 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3056 "util/configparser.c" /* yacc.c:1646 */ +#line 3137 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 790 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 821 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3067 "util/configparser.c" /* yacc.c:1646 */ +#line 3148 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 798 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 829 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3078 "util/configparser.c" /* yacc.c:1646 */ +#line 3159 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 806 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 837 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3089 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 814 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 845 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3099 "util/configparser.c" /* yacc.c:1646 */ +#line 3180 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 821 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 852 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3109,21 +3190,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3113 "util/configparser.c" /* yacc.c:1646 */ +#line 3194 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 832 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 863 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3123 "util/configparser.c" /* yacc.c:1646 */ +#line 3204 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 839 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 870 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3131,11 +3212,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3135 "util/configparser.c" /* yacc.c:1646 */ +#line 3216 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 848 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 879 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3143,11 +3224,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3147 "util/configparser.c" /* yacc.c:1646 */ +#line 3228 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 857 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 888 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3155,53 +3236,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3159 "util/configparser.c" /* yacc.c:1646 */ +#line 3240 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 866 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 897 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3169 "util/configparser.c" /* yacc.c:1646 */ +#line 3250 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 873 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 904 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3179 "util/configparser.c" /* yacc.c:1646 */ +#line 3260 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 880 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 911 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3190 "util/configparser.c" /* yacc.c:1646 */ +#line 3271 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 888 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 919 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3201 "util/configparser.c" /* yacc.c:1646 */ +#line 3282 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 896 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 927 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3210,11 +3291,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3214 "util/configparser.c" /* yacc.c:1646 */ +#line 3295 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 906 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 937 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3223,11 +3304,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3227 "util/configparser.c" /* yacc.c:1646 */ +#line 3308 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 916 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 947 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3236,11 +3317,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3240 "util/configparser.c" /* yacc.c:1646 */ +#line 3321 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 926 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 957 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3252,11 +3333,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3256 "util/configparser.c" /* yacc.c:1646 */ +#line 3337 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 939 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 970 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3266,22 +3347,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3270 "util/configparser.c" /* yacc.c:1646 */ +#line 3351 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 950 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 981 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3281 "util/configparser.c" /* yacc.c:1646 */ +#line 3362 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 958 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 989 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3293,11 +3374,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3297 "util/configparser.c" /* yacc.c:1646 */ +#line 3378 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 971 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1002 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3305,11 +3386,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3309 "util/configparser.c" /* yacc.c:1646 */ +#line 3390 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 980 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1011 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3317,11 +3398,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3321 "util/configparser.c" /* yacc.c:1646 */ +#line 3402 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 989 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1020 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3329,11 +3410,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3333 "util/configparser.c" /* yacc.c:1646 */ +#line 3414 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 998 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1029 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3342,11 +3423,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3346 "util/configparser.c" /* yacc.c:1646 */ +#line 3427 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1008 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1039 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3355,22 +3436,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3359 "util/configparser.c" /* yacc.c:1646 */ +#line 3440 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1018 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1049 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3370 "util/configparser.c" /* yacc.c:1646 */ +#line 3451 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1026 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1057 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3382,11 +3463,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3386 "util/configparser.c" /* yacc.c:1646 */ +#line 3467 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1039 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1070 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3394,22 +3475,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3398 "util/configparser.c" /* yacc.c:1646 */ +#line 3479 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1048 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1079 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3409 "util/configparser.c" /* yacc.c:1646 */ +#line 3490 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1056 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1087 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3417,22 +3498,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3421 "util/configparser.c" /* yacc.c:1646 */ +#line 3502 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1065 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1096 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3432 "util/configparser.c" /* yacc.c:1646 */ +#line 3513 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1073 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1104 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3444,11 +3525,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3448 "util/configparser.c" /* yacc.c:1646 */ +#line 3529 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1086 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1117 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3456,21 +3537,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3460 "util/configparser.c" /* yacc.c:1646 */ +#line 3541 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1095 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1126 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 3470 "util/configparser.c" /* yacc.c:1646 */ +#line 3551 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1102 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1133 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3479,11 +3560,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3483 "util/configparser.c" /* yacc.c:1646 */ +#line 3564 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1112 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1143 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3492,11 +3573,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3496 "util/configparser.c" /* yacc.c:1646 */ +#line 3577 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1122 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1153 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3505,11 +3586,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3509 "util/configparser.c" /* yacc.c:1646 */ +#line 3590 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1132 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1163 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3518,11 +3599,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3522 "util/configparser.c" /* yacc.c:1646 */ +#line 3603 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1142 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1173 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3531,11 +3612,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3535 "util/configparser.c" /* yacc.c:1646 */ +#line 3616 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1152 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1183 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3544,11 +3625,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3548 "util/configparser.c" /* yacc.c:1646 */ +#line 3629 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1162 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1193 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3557,11 +3638,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3561 "util/configparser.c" /* yacc.c:1646 */ +#line 3642 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1172 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1203 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3570,41 +3651,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3574 "util/configparser.c" /* yacc.c:1646 */ +#line 3655 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1182 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1213 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3584 "util/configparser.c" /* yacc.c:1646 */ +#line 3665 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1189 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1220 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3594 "util/configparser.c" /* yacc.c:1646 */ +#line 3675 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1196 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1227 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3604 "util/configparser.c" /* yacc.c:1646 */ +#line 3685 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1203 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1234 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3612,11 +3693,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3616 "util/configparser.c" /* yacc.c:1646 */ +#line 3697 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1212 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1243 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3624,11 +3705,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3628 "util/configparser.c" /* yacc.c:1646 */ +#line 3709 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1221 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1252 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3636,21 +3717,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3640 "util/configparser.c" /* yacc.c:1646 */ +#line 3721 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1230 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1261 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3650 "util/configparser.c" /* yacc.c:1646 */ +#line 3731 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1237 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1268 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3659,11 +3740,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3663 "util/configparser.c" /* yacc.c:1646 */ +#line 3744 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1247 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1278 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -3679,21 +3760,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3683 "util/configparser.c" /* yacc.c:1646 */ +#line 3764 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1264 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1295 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 3693 "util/configparser.c" /* yacc.c:1646 */ +#line 3774 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1271 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1302 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3710,11 +3791,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3714 "util/configparser.c" /* yacc.c:1646 */ +#line 3795 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1289 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1320 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3726,11 +3807,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3730 "util/configparser.c" /* yacc.c:1646 */ +#line 3811 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1302 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1333 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3742,11 +3823,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3746 "util/configparser.c" /* yacc.c:1646 */ +#line 3827 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1315 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1346 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3754,11 +3835,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3758 "util/configparser.c" /* yacc.c:1646 */ +#line 3839 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1324 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1355 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3766,11 +3847,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3770 "util/configparser.c" /* yacc.c:1646 */ +#line 3851 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1333 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1364 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3778,11 +3859,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3782 "util/configparser.c" /* yacc.c:1646 */ +#line 3863 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1342 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1373 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3790,11 +3871,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3794 "util/configparser.c" /* yacc.c:1646 */ +#line 3875 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1351 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1382 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3803,11 +3884,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3807 "util/configparser.c" /* yacc.c:1646 */ +#line 3888 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1361 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1392 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3816,11 +3897,25 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3820 "util/configparser.c" /* yacc.c:1646 */ +#line 3901 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1371 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1402 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else + cfg_parser->cfg->aggressive_nsec = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3915 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 329: +#line 1413 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3828,11 +3923,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3832 "util/configparser.c" /* yacc.c:1646 */ +#line 3927 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1380 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1422 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3840,11 +3935,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3844 "util/configparser.c" /* yacc.c:1646 */ +#line 3939 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1389 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1431 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3856,11 +3951,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3860 "util/configparser.c" /* yacc.c:1646 */ +#line 3955 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1402 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1444 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3872,11 +3967,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3876 "util/configparser.c" /* yacc.c:1646 */ +#line 3971 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1415 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1457 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3884,21 +3979,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3888 "util/configparser.c" /* yacc.c:1646 */ +#line 3983 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1424 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1466 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 3898 "util/configparser.c" /* yacc.c:1646 */ +#line 3993 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1431 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1473 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3906,11 +4001,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3910 "util/configparser.c" /* yacc.c:1646 */ +#line 4005 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1440 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1482 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3918,11 +4013,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3922 "util/configparser.c" /* yacc.c:1646 */ +#line 4017 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1449 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1491 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3930,11 +4025,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3934 "util/configparser.c" /* yacc.c:1646 */ +#line 4029 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1458 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1500 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3943,22 +4038,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3947 "util/configparser.c" /* yacc.c:1646 */ +#line 4042 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1467 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1509 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3958 "util/configparser.c" /* yacc.c:1646 */ +#line 4053 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1475 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1517 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3970,22 +4065,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3974 "util/configparser.c" /* yacc.c:1646 */ +#line 4069 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1488 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1530 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3985 "util/configparser.c" /* yacc.c:1646 */ +#line 4080 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1496 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1538 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -3995,12 +4090,13 @@ yyreduce: && strcmp((yyvsp[0].str), "always_transparent")!=0 && strcmp((yyvsp[0].str), "always_refuse")!=0 && strcmp((yyvsp[0].str), "always_nxdomain")!=0 + && strcmp((yyvsp[0].str), "noview")!=0 && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0) yyerror("local-zone type: expected static, deny, " "refuse, redirect, transparent, " "typetransparent, inform, inform_deny, " "always_transparent, always_refuse, " - "always_nxdomain or nodefault"); + "always_nxdomain, noview or nodefault"); else if(strcmp((yyvsp[0].str), "nodefault")==0) { if(!cfg_strlist_insert(&cfg_parser->cfg-> local_zones_nodefault, (yyvsp[-1].str))) @@ -4012,21 +4108,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4016 "util/configparser.c" /* yacc.c:1646 */ +#line 4112 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1524 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1567 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 4026 "util/configparser.c" /* yacc.c:1646 */ +#line 4122 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1531 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1574 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4040,11 +4136,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4044 "util/configparser.c" /* yacc.c:1646 */ +#line 4140 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1546 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1589 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4053,11 +4149,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4057 "util/configparser.c" /* yacc.c:1646 */ +#line 4153 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1556 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1599 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4066,31 +4162,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4070 "util/configparser.c" /* yacc.c:1646 */ +#line 4166 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1566 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1609 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4080 "util/configparser.c" /* yacc.c:1646 */ +#line 4176 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1573 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1616 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4090 "util/configparser.c" /* yacc.c:1646 */ +#line 4186 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1580 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1623 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4098,11 +4194,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4102 "util/configparser.c" /* yacc.c:1646 */ +#line 4198 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1589 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1632 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4115,11 +4211,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4119 "util/configparser.c" /* yacc.c:1646 */ +#line 4215 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1603 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1646 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4137,11 +4233,11 @@ yyreduce: } } } -#line 4141 "util/configparser.c" /* yacc.c:1646 */ +#line 4237 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1622 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1665 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4159,11 +4255,11 @@ yyreduce: } } } -#line 4163 "util/configparser.c" /* yacc.c:1646 */ +#line 4259 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1641 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1684 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -4174,11 +4270,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4178 "util/configparser.c" /* yacc.c:1646 */ +#line 4274 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1653 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1696 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -4189,11 +4285,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4193 "util/configparser.c" /* yacc.c:1646 */ +#line 4289 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1665 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1708 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -4204,11 +4300,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4208 "util/configparser.c" /* yacc.c:1646 */ +#line 4304 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1677 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1720 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4218,11 +4314,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4222 "util/configparser.c" /* yacc.c:1646 */ +#line 4318 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1688 "util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1731 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4240,11 +4336,11 @@ yyreduce: } } } -#line 4244 "util/configparser.c" /* yacc.c:1646 */ +#line 4340 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1707 "util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1750 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4252,11 +4348,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4256 "util/configparser.c" /* yacc.c:1646 */ +#line 4352 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1717 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1760 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4264,33 +4360,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4268 "util/configparser.c" /* yacc.c:1646 */ +#line 4364 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1726 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1769 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4279 "util/configparser.c" /* yacc.c:1646 */ +#line 4375 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1734 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1777 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4290 "util/configparser.c" /* yacc.c:1646 */ +#line 4386 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1742 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1785 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4302,11 +4398,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4306 "util/configparser.c" /* yacc.c:1646 */ +#line 4402 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1755 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1798 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4318,11 +4414,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4322 "util/configparser.c" /* yacc.c:1646 */ +#line 4418 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1768 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1811 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4334,11 +4430,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4338 "util/configparser.c" /* yacc.c:1646 */ +#line 4434 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1781 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1824 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4350,11 +4446,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4354 "util/configparser.c" /* yacc.c:1646 */ +#line 4450 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1794 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1837 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4362,11 +4458,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4366 "util/configparser.c" /* yacc.c:1646 */ +#line 4462 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1803 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1846 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4374,11 +4470,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4378 "util/configparser.c" /* yacc.c:1646 */ +#line 4474 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1812 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1855 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4387,11 +4483,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4391 "util/configparser.c" /* yacc.c:1646 */ +#line 4487 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1822 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1865 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4400,11 +4496,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4404 "util/configparser.c" /* yacc.c:1646 */ +#line 4500 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1832 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1875 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4416,11 +4512,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4420 "util/configparser.c" /* yacc.c:1646 */ +#line 4516 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1845 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1888 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4432,11 +4528,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4436 "util/configparser.c" /* yacc.c:1646 */ +#line 4532 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1858 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1901 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4446,11 +4542,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4450 "util/configparser.c" /* yacc.c:1646 */ +#line 4546 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1869 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1912 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4462,11 +4558,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4466 "util/configparser.c" /* yacc.c:1646 */ +#line 4562 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1882 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1925 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4476,11 +4572,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4480 "util/configparser.c" /* yacc.c:1646 */ +#line 4576 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1893 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1936 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4492,11 +4588,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4496 "util/configparser.c" /* yacc.c:1646 */ +#line 4592 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1906 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1949 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4505,31 +4601,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4509 "util/configparser.c" /* yacc.c:1646 */ +#line 4605 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1916 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1959 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4519 "util/configparser.c" /* yacc.c:1646 */ +#line 4615 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1923 "util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1966 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4529 "util/configparser.c" /* yacc.c:1646 */ +#line 4625 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1930 "util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1973 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4537,11 +4633,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4541 "util/configparser.c" /* yacc.c:1646 */ +#line 4637 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1939 "util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1982 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4550,11 +4646,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4554 "util/configparser.c" /* yacc.c:1646 */ +#line 4650 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1949 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1992 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4563,11 +4659,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4567 "util/configparser.c" /* yacc.c:1646 */ +#line 4663 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1959 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 2002 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4576,31 +4672,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4580 "util/configparser.c" /* yacc.c:1646 */ +#line 4676 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1969 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 2012 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4590 "util/configparser.c" /* yacc.c:1646 */ +#line 4686 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1976 "util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 2019 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4600 "util/configparser.c" /* yacc.c:1646 */ +#line 4696 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1983 "util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 2026 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4608,11 +4704,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4612 "util/configparser.c" /* yacc.c:1646 */ +#line 4708 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1992 "util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 2035 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4621,11 +4717,93 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4625 "util/configparser.c" /* yacc.c:1646 */ +#line 4721 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 2002 "util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 2045 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(name:%s)\n", (yyvsp[0].str))); + if(cfg_parser->cfg->auths->name) + yyerror("auth name override, there must be one name " + "for one auth-zone"); + free(cfg_parser->cfg->auths->name); + cfg_parser->cfg->auths->name = (yyvsp[0].str); + } +#line 4734 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 388: +#line 2055 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); + free(cfg_parser->cfg->auths->zonefile); + cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); + } +#line 4744 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 389: +#line 2062 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(master:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) + yyerror("out of memory"); + } +#line 4754 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 390: +#line 2069 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(url:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) + yyerror("out of memory"); + } +#line 4764 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 391: +#line 2076 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->auths->for_downstream = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4777 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 392: +#line 2086 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->auths->for_upstream = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4790 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 393: +#line 2096 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->auths->fallback_enabled = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4803 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 394: +#line 2106 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4634,11 +4812,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4638 "util/configparser.c" /* yacc.c:1646 */ +#line 4816 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 2012 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 2116 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -4648,12 +4826,13 @@ yyreduce: && strcmp((yyvsp[0].str), "always_transparent")!=0 && strcmp((yyvsp[0].str), "always_refuse")!=0 && strcmp((yyvsp[0].str), "always_nxdomain")!=0 + && strcmp((yyvsp[0].str), "noview")!=0 && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0) yyerror("local-zone type: expected static, deny, " "refuse, redirect, transparent, " "typetransparent, inform, inform_deny, " "always_transparent, always_refuse, " - "always_nxdomain or nodefault"); + "always_nxdomain, noview or nodefault"); else if(strcmp((yyvsp[0].str), "nodefault")==0) { if(!cfg_strlist_insert(&cfg_parser->cfg->views-> local_zones_nodefault, (yyvsp[-1].str))) @@ -4666,11 +4845,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4670 "util/configparser.c" /* yacc.c:1646 */ +#line 4849 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 2041 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2146 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4679,22 +4858,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4683 "util/configparser.c" /* yacc.c:1646 */ +#line 4862 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 2051 "util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2156 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 4694 "util/configparser.c" /* yacc.c:1646 */ +#line 4873 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 2059 "util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2164 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -4702,11 +4881,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4706 "util/configparser.c" /* yacc.c:1646 */ +#line 4885 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 2068 "util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2173 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4720,11 +4899,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4724 "util/configparser.c" /* yacc.c:1646 */ +#line 4903 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 2083 "util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2188 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4732,19 +4911,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4736 "util/configparser.c" /* yacc.c:1646 */ +#line 4915 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 2092 "util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2197 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4744 "util/configparser.c" /* yacc.c:1646 */ +#line 4923 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2103 "util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2208 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4753,11 +4932,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4757 "util/configparser.c" /* yacc.c:1646 */ +#line 4936 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2113 "util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2218 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4765,21 +4944,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4769 "util/configparser.c" /* yacc.c:1646 */ +#line 4948 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2122 "util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2227 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4779 "util/configparser.c" /* yacc.c:1646 */ +#line 4958 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2129 "util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2234 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4788,122 +4967,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4792 "util/configparser.c" /* yacc.c:1646 */ +#line 4971 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2139 "util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2244 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 4802 "util/configparser.c" /* yacc.c:1646 */ +#line 4981 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2146 "util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2251 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 4812 "util/configparser.c" /* yacc.c:1646 */ +#line 4991 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2153 "util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 2258 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 4822 "util/configparser.c" /* yacc.c:1646 */ +#line 5001 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2160 "util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2265 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 4832 "util/configparser.c" /* yacc.c:1646 */ +#line 5011 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2167 "util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2272 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4840 "util/configparser.c" /* yacc.c:1646 */ +#line 5019 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2184 "util/configparser.y" /* yacc.c:1646 */ + case 435: +#line 2289 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4851 "util/configparser.c" /* yacc.c:1646 */ +#line 5030 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2192 "util/configparser.y" /* yacc.c:1646 */ + case 436: +#line 2297 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 4861 "util/configparser.c" /* yacc.c:1646 */ +#line 5040 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2199 "util/configparser.y" /* yacc.c:1646 */ + case 437: +#line 2304 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4872 "util/configparser.c" /* yacc.c:1646 */ +#line 5051 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 2207 "util/configparser.y" /* yacc.c:1646 */ + case 438: +#line 2312 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4883 "util/configparser.c" /* yacc.c:1646 */ +#line 5062 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 2215 "util/configparser.y" /* yacc.c:1646 */ + case 439: +#line 2320 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 4893 "util/configparser.c" /* yacc.c:1646 */ +#line 5072 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 2222 "util/configparser.y" /* yacc.c:1646 */ + case 440: +#line 2327 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 4903 "util/configparser.c" /* yacc.c:1646 */ +#line 5082 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 2229 "util/configparser.y" /* yacc.c:1646 */ + case 441: +#line 2334 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4911,11 +5090,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4915 "util/configparser.c" /* yacc.c:1646 */ +#line 5094 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 2238 "util/configparser.y" /* yacc.c:1646 */ + case 442: +#line 2343 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4923,11 +5102,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4927 "util/configparser.c" /* yacc.c:1646 */ +#line 5106 "util/configparser.c" /* yacc.c:1646 */ break; - case 421: -#line 2247 "util/configparser.y" /* yacc.c:1646 */ + case 443: +#line 2352 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4935,11 +5114,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4939 "util/configparser.c" /* yacc.c:1646 */ +#line 5118 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 2256 "util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2361 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4947,11 +5126,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4951 "util/configparser.c" /* yacc.c:1646 */ +#line 5130 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 2265 "util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2370 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4959,11 +5138,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4963 "util/configparser.c" /* yacc.c:1646 */ +#line 5142 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 2274 "util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2379 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4971,29 +5150,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4975 "util/configparser.c" /* yacc.c:1646 */ +#line 5154 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 2283 "util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2388 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4983 "util/configparser.c" /* yacc.c:1646 */ +#line 5162 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2292 "util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2397 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 4993 "util/configparser.c" /* yacc.c:1646 */ +#line 5172 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2298 "util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2403 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5002,21 +5181,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5006 "util/configparser.c" /* yacc.c:1646 */ +#line 5185 "util/configparser.c" /* yacc.c:1646 */ break; - case 431: -#line 2308 "util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2413 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 5016 "util/configparser.c" /* yacc.c:1646 */ +#line 5195 "util/configparser.c" /* yacc.c:1646 */ break; - case 432: -#line 2315 "util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2420 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5024,31 +5203,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5028 "util/configparser.c" /* yacc.c:1646 */ +#line 5207 "util/configparser.c" /* yacc.c:1646 */ break; - case 433: -#line 2324 "util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2429 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5039 "util/configparser.c" /* yacc.c:1646 */ +#line 5218 "util/configparser.c" /* yacc.c:1646 */ break; - case 434: -#line 2332 "util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2437 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5048 "util/configparser.c" /* yacc.c:1646 */ +#line 5227 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2348 "util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2454 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5056,11 +5235,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5060 "util/configparser.c" /* yacc.c:1646 */ +#line 5239 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2358 "util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2464 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5069,52 +5248,66 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5073 "util/configparser.c" /* yacc.c:1646 */ +#line 5252 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2368 "util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2474 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5083 "util/configparser.c" /* yacc.c:1646 */ +#line 5262 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2375 "util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2481 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); + if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) + log_warn("dnscrypt-provider-cert %s is a duplicate", (yyvsp[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5093 "util/configparser.c" /* yacc.c:1646 */ +#line 5274 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 473: +#line 2490 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) + fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); + } +#line 5284 "util/configparser.c" /* yacc.c:1646 */ break; - case 450: -#line 2382 "util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2497 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); + if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) + log_warn("dnscrypt-secret-key: %s is a duplicate", (yyvsp[0].str)); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5103 "util/configparser.c" /* yacc.c:1646 */ +#line 5296 "util/configparser.c" /* yacc.c:1646 */ break; - case 451: -#line 2389 "util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2506 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5114 "util/configparser.c" /* yacc.c:1646 */ +#line 5307 "util/configparser.c" /* yacc.c:1646 */ break; - case 452: -#line 2397 "util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2514 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5126,22 +5319,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5130 "util/configparser.c" /* yacc.c:1646 */ +#line 5323 "util/configparser.c" /* yacc.c:1646 */ break; - case 453: -#line 2410 "util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2527 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5141 "util/configparser.c" /* yacc.c:1646 */ +#line 5334 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2418 "util/configparser.y" /* yacc.c:1646 */ + case 478: +#line 2535 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5153,19 +5346,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5157 "util/configparser.c" /* yacc.c:1646 */ +#line 5350 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2431 "util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2548 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5165 "util/configparser.c" /* yacc.c:1646 */ +#line 5358 "util/configparser.c" /* yacc.c:1646 */ break; - case 460: -#line 2440 "util/configparser.y" /* yacc.c:1646 */ + case 484: +#line 2557 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5178,11 +5371,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5182 "util/configparser.c" /* yacc.c:1646 */ +#line 5375 "util/configparser.c" /* yacc.c:1646 */ break; - case 461: -#line 2454 "util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2571 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5196,11 +5389,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5200 "util/configparser.c" /* yacc.c:1646 */ +#line 5393 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5204 "util/configparser.c" /* yacc.c:1646 */ +#line 5397 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5428,7 +5621,7 @@ yyreturn: #endif return yyresult; } -#line 2468 "util/configparser.y" /* yacc.c:1906 */ +#line 2585 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |