diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 3133 |
1 files changed, 1655 insertions, 1478 deletions
diff --git a/util/configparser.c b/util/configparser.c index 432ad48948c3..6ddfaca1d7b4 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.4.1. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.4" +#define YYBISON_VERSION "3.4.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -61,8 +65,8 @@ -/* Copy the first part of user declarations. */ -#line 38 "util/configparser.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 38 "util/configparser.y" #include "config.h" @@ -91,13 +95,17 @@ extern struct config_parser_state* cfg_parser; #endif -#line 95 "util/configparser.c" /* yacc.c:339 */ +#line 99 "util/configparser.c" # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -109,8 +117,8 @@ extern struct config_parser_state* cfg_parser; # define YYERROR_VERBOSE 0 #endif -/* In a future release of Bison, this section will be replaced - by #include "configparser.h". */ +/* Use api.header.include to #include this header + instead of duplicating it here. */ #ifndef YY_YY_UTIL_CONFIGPARSER_H_INCLUDED # define YY_YY_UTIL_CONFIGPARSER_H_INCLUDED /* Debug traces. */ @@ -331,68 +339,76 @@ extern int yydebug; VAR_SERVE_EXPIRED = 460, VAR_SERVE_EXPIRED_TTL = 461, VAR_SERVE_EXPIRED_TTL_RESET = 462, - VAR_FAKE_DSA = 463, - VAR_FAKE_SHA1 = 464, - VAR_LOG_IDENTITY = 465, - VAR_HIDE_TRUSTANCHOR = 466, - VAR_TRUST_ANCHOR_SIGNALING = 467, - VAR_AGGRESSIVE_NSEC = 468, - VAR_USE_SYSTEMD = 469, - VAR_SHM_ENABLE = 470, - VAR_SHM_KEY = 471, - VAR_ROOT_KEY_SENTINEL = 472, - VAR_DNSCRYPT = 473, - VAR_DNSCRYPT_ENABLE = 474, - VAR_DNSCRYPT_PORT = 475, - VAR_DNSCRYPT_PROVIDER = 476, - VAR_DNSCRYPT_SECRET_KEY = 477, - VAR_DNSCRYPT_PROVIDER_CERT = 478, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 479, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 480, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 481, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 482, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 483, - VAR_IPSECMOD_ENABLED = 484, - VAR_IPSECMOD_HOOK = 485, - VAR_IPSECMOD_IGNORE_BOGUS = 486, - VAR_IPSECMOD_MAX_TTL = 487, - VAR_IPSECMOD_WHITELIST = 488, - VAR_IPSECMOD_STRICT = 489, - VAR_CACHEDB = 490, - VAR_CACHEDB_BACKEND = 491, - VAR_CACHEDB_SECRETSEED = 492, - VAR_CACHEDB_REDISHOST = 493, - VAR_CACHEDB_REDISPORT = 494, - VAR_CACHEDB_REDISTIMEOUT = 495, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 496, - VAR_FOR_UPSTREAM = 497, - VAR_AUTH_ZONE = 498, - VAR_ZONEFILE = 499, - VAR_MASTER = 500, - VAR_URL = 501, - VAR_FOR_DOWNSTREAM = 502, - VAR_FALLBACK_ENABLED = 503, - VAR_TLS_ADDITIONAL_PORT = 504, - VAR_LOW_RTT = 505, - VAR_LOW_RTT_PERMIL = 506, - VAR_FAST_SERVER_PERMIL = 507, - VAR_FAST_SERVER_NUM = 508, - VAR_ALLOW_NOTIFY = 509, - VAR_TLS_WIN_CERT = 510, - VAR_TCP_CONNECTION_LIMIT = 511, - VAR_FORWARD_NO_CACHE = 512, - VAR_STUB_NO_CACHE = 513, - VAR_LOG_SERVFAIL = 514, - VAR_DENY_ANY = 515, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 516, - VAR_LOG_TAG_QUERYREPLY = 517, - VAR_STREAM_WAIT_SIZE = 518, - VAR_TLS_CIPHERS = 519, - VAR_TLS_CIPHERSUITES = 520, - VAR_TLS_SESSION_TICKET_KEYS = 521, - VAR_IPSET = 522, - VAR_IPSET_NAME_V4 = 523, - VAR_IPSET_NAME_V6 = 524 + VAR_SERVE_EXPIRED_REPLY_TTL = 463, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 464, + VAR_FAKE_DSA = 465, + VAR_FAKE_SHA1 = 466, + VAR_LOG_IDENTITY = 467, + VAR_HIDE_TRUSTANCHOR = 468, + VAR_TRUST_ANCHOR_SIGNALING = 469, + VAR_AGGRESSIVE_NSEC = 470, + VAR_USE_SYSTEMD = 471, + VAR_SHM_ENABLE = 472, + VAR_SHM_KEY = 473, + VAR_ROOT_KEY_SENTINEL = 474, + VAR_DNSCRYPT = 475, + VAR_DNSCRYPT_ENABLE = 476, + VAR_DNSCRYPT_PORT = 477, + VAR_DNSCRYPT_PROVIDER = 478, + VAR_DNSCRYPT_SECRET_KEY = 479, + VAR_DNSCRYPT_PROVIDER_CERT = 480, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 481, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 482, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 483, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 484, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 485, + VAR_IPSECMOD_ENABLED = 486, + VAR_IPSECMOD_HOOK = 487, + VAR_IPSECMOD_IGNORE_BOGUS = 488, + VAR_IPSECMOD_MAX_TTL = 489, + VAR_IPSECMOD_WHITELIST = 490, + VAR_IPSECMOD_STRICT = 491, + VAR_CACHEDB = 492, + VAR_CACHEDB_BACKEND = 493, + VAR_CACHEDB_SECRETSEED = 494, + VAR_CACHEDB_REDISHOST = 495, + VAR_CACHEDB_REDISPORT = 496, + VAR_CACHEDB_REDISTIMEOUT = 497, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 498, + VAR_FOR_UPSTREAM = 499, + VAR_AUTH_ZONE = 500, + VAR_ZONEFILE = 501, + VAR_MASTER = 502, + VAR_URL = 503, + VAR_FOR_DOWNSTREAM = 504, + VAR_FALLBACK_ENABLED = 505, + VAR_TLS_ADDITIONAL_PORT = 506, + VAR_LOW_RTT = 507, + VAR_LOW_RTT_PERMIL = 508, + VAR_FAST_SERVER_PERMIL = 509, + VAR_FAST_SERVER_NUM = 510, + VAR_ALLOW_NOTIFY = 511, + VAR_TLS_WIN_CERT = 512, + VAR_TCP_CONNECTION_LIMIT = 513, + VAR_FORWARD_NO_CACHE = 514, + VAR_STUB_NO_CACHE = 515, + VAR_LOG_SERVFAIL = 516, + VAR_DENY_ANY = 517, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 518, + VAR_LOG_TAG_QUERYREPLY = 519, + VAR_STREAM_WAIT_SIZE = 520, + VAR_TLS_CIPHERS = 521, + VAR_TLS_CIPHERSUITES = 522, + VAR_IPSET = 523, + VAR_IPSET_NAME_V4 = 524, + VAR_IPSET_NAME_V6 = 525, + VAR_TLS_SESSION_TICKET_KEYS = 526, + VAR_RPZ = 527, + VAR_TAGS = 528, + VAR_RPZ_ACTION_OVERRIDE = 529, + VAR_RPZ_CNAME_OVERRIDE = 530, + VAR_RPZ_LOG = 531, + VAR_RPZ_LOG_NAME = 532 }; #endif /* Tokens. */ @@ -601,81 +617,88 @@ extern int yydebug; #define VAR_SERVE_EXPIRED 460 #define VAR_SERVE_EXPIRED_TTL 461 #define VAR_SERVE_EXPIRED_TTL_RESET 462 -#define VAR_FAKE_DSA 463 -#define VAR_FAKE_SHA1 464 -#define VAR_LOG_IDENTITY 465 -#define VAR_HIDE_TRUSTANCHOR 466 -#define VAR_TRUST_ANCHOR_SIGNALING 467 -#define VAR_AGGRESSIVE_NSEC 468 -#define VAR_USE_SYSTEMD 469 -#define VAR_SHM_ENABLE 470 -#define VAR_SHM_KEY 471 -#define VAR_ROOT_KEY_SENTINEL 472 -#define VAR_DNSCRYPT 473 -#define VAR_DNSCRYPT_ENABLE 474 -#define VAR_DNSCRYPT_PORT 475 -#define VAR_DNSCRYPT_PROVIDER 476 -#define VAR_DNSCRYPT_SECRET_KEY 477 -#define VAR_DNSCRYPT_PROVIDER_CERT 478 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 479 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 480 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 481 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 482 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 483 -#define VAR_IPSECMOD_ENABLED 484 -#define VAR_IPSECMOD_HOOK 485 -#define VAR_IPSECMOD_IGNORE_BOGUS 486 -#define VAR_IPSECMOD_MAX_TTL 487 -#define VAR_IPSECMOD_WHITELIST 488 -#define VAR_IPSECMOD_STRICT 489 -#define VAR_CACHEDB 490 -#define VAR_CACHEDB_BACKEND 491 -#define VAR_CACHEDB_SECRETSEED 492 -#define VAR_CACHEDB_REDISHOST 493 -#define VAR_CACHEDB_REDISPORT 494 -#define VAR_CACHEDB_REDISTIMEOUT 495 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 496 -#define VAR_FOR_UPSTREAM 497 -#define VAR_AUTH_ZONE 498 -#define VAR_ZONEFILE 499 -#define VAR_MASTER 500 -#define VAR_URL 501 -#define VAR_FOR_DOWNSTREAM 502 -#define VAR_FALLBACK_ENABLED 503 -#define VAR_TLS_ADDITIONAL_PORT 504 -#define VAR_LOW_RTT 505 -#define VAR_LOW_RTT_PERMIL 506 -#define VAR_FAST_SERVER_PERMIL 507 -#define VAR_FAST_SERVER_NUM 508 -#define VAR_ALLOW_NOTIFY 509 -#define VAR_TLS_WIN_CERT 510 -#define VAR_TCP_CONNECTION_LIMIT 511 -#define VAR_FORWARD_NO_CACHE 512 -#define VAR_STUB_NO_CACHE 513 -#define VAR_LOG_SERVFAIL 514 -#define VAR_DENY_ANY 515 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 516 -#define VAR_LOG_TAG_QUERYREPLY 517 -#define VAR_STREAM_WAIT_SIZE 518 -#define VAR_TLS_CIPHERS 519 -#define VAR_TLS_CIPHERSUITES 520 -#define VAR_TLS_SESSION_TICKET_KEYS 521 -#define VAR_IPSET 522 -#define VAR_IPSET_NAME_V4 523 -#define VAR_IPSET_NAME_V6 524 +#define VAR_SERVE_EXPIRED_REPLY_TTL 463 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 464 +#define VAR_FAKE_DSA 465 +#define VAR_FAKE_SHA1 466 +#define VAR_LOG_IDENTITY 467 +#define VAR_HIDE_TRUSTANCHOR 468 +#define VAR_TRUST_ANCHOR_SIGNALING 469 +#define VAR_AGGRESSIVE_NSEC 470 +#define VAR_USE_SYSTEMD 471 +#define VAR_SHM_ENABLE 472 +#define VAR_SHM_KEY 473 +#define VAR_ROOT_KEY_SENTINEL 474 +#define VAR_DNSCRYPT 475 +#define VAR_DNSCRYPT_ENABLE 476 +#define VAR_DNSCRYPT_PORT 477 +#define VAR_DNSCRYPT_PROVIDER 478 +#define VAR_DNSCRYPT_SECRET_KEY 479 +#define VAR_DNSCRYPT_PROVIDER_CERT 480 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 481 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 482 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 483 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 484 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 485 +#define VAR_IPSECMOD_ENABLED 486 +#define VAR_IPSECMOD_HOOK 487 +#define VAR_IPSECMOD_IGNORE_BOGUS 488 +#define VAR_IPSECMOD_MAX_TTL 489 +#define VAR_IPSECMOD_WHITELIST 490 +#define VAR_IPSECMOD_STRICT 491 +#define VAR_CACHEDB 492 +#define VAR_CACHEDB_BACKEND 493 +#define VAR_CACHEDB_SECRETSEED 494 +#define VAR_CACHEDB_REDISHOST 495 +#define VAR_CACHEDB_REDISPORT 496 +#define VAR_CACHEDB_REDISTIMEOUT 497 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 498 +#define VAR_FOR_UPSTREAM 499 +#define VAR_AUTH_ZONE 500 +#define VAR_ZONEFILE 501 +#define VAR_MASTER 502 +#define VAR_URL 503 +#define VAR_FOR_DOWNSTREAM 504 +#define VAR_FALLBACK_ENABLED 505 +#define VAR_TLS_ADDITIONAL_PORT 506 +#define VAR_LOW_RTT 507 +#define VAR_LOW_RTT_PERMIL 508 +#define VAR_FAST_SERVER_PERMIL 509 +#define VAR_FAST_SERVER_NUM 510 +#define VAR_ALLOW_NOTIFY 511 +#define VAR_TLS_WIN_CERT 512 +#define VAR_TCP_CONNECTION_LIMIT 513 +#define VAR_FORWARD_NO_CACHE 514 +#define VAR_STUB_NO_CACHE 515 +#define VAR_LOG_SERVFAIL 516 +#define VAR_DENY_ANY 517 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 518 +#define VAR_LOG_TAG_QUERYREPLY 519 +#define VAR_STREAM_WAIT_SIZE 520 +#define VAR_TLS_CIPHERS 521 +#define VAR_TLS_CIPHERSUITES 522 +#define VAR_IPSET 523 +#define VAR_IPSET_NAME_V4 524 +#define VAR_IPSET_NAME_V6 525 +#define VAR_TLS_SESSION_TICKET_KEYS 526 +#define VAR_RPZ 527 +#define VAR_TAGS 528 +#define VAR_RPZ_ACTION_OVERRIDE 529 +#define VAR_RPZ_CNAME_OVERRIDE 530 +#define VAR_RPZ_LOG 531 +#define VAR_RPZ_LOG_NAME 532 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - union YYSTYPE { -#line 66 "util/configparser.y" /* yacc.c:355 */ +#line 66 "util/configparser.y" char* str; -#line 677 "util/configparser.c" /* yacc.c:355 */ -}; +#line 700 "util/configparser.c" +}; typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -688,9 +711,7 @@ int yyparse (void); #endif /* !YY_YY_UTIL_CONFIGPARSER_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 694 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -711,13 +732,13 @@ typedef signed char yytype_int8; #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -729,7 +750,7 @@ typedef short int yytype_int16; # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -765,15 +786,6 @@ typedef short int yytype_int16; # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -781,7 +793,7 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -801,6 +813,8 @@ typedef short int yytype_int16; #endif +#define YY_ASSERT(E) ((void) (0 && (E))) + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -932,27 +946,27 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 543 +#define YYLAST 590 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 270 +#define YYNTOKENS 278 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 291 +#define YYNNTS 301 /* YYNRULES -- Number of rules. */ -#define YYNRULES 557 +#define YYNRULES 580 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 833 +#define YYNSTATES 863 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 524 +#define YYMAXUTOK 532 +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ + as returned by yylex. */ static const yytype_uint16 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1007,69 +1021,73 @@ static const yytype_uint16 yytranslate[] = 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 + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 173, 173, 173, 174, 174, 175, 175, 176, 176, - 176, 177, 177, 178, 178, 182, 187, 188, 189, 189, - 189, 190, 190, 191, 191, 192, 192, 193, 193, 193, - 194, 194, 195, 195, 195, 196, 196, 196, 197, 197, - 198, 198, 199, 199, 200, 200, 201, 201, 202, 202, - 203, 203, 204, 204, 205, 205, 205, 206, 206, 206, - 207, 207, 207, 208, 208, 209, 209, 210, 210, 211, - 211, 212, 212, 212, 213, 213, 214, 214, 215, 215, - 215, 216, 216, 217, 217, 218, 218, 219, 219, 219, - 220, 220, 221, 221, 222, 222, 223, 223, 224, 224, - 225, 225, 225, 226, 226, 227, 227, 227, 228, 228, - 228, 229, 229, 229, 230, 230, 230, 230, 231, 232, - 232, 232, 233, 233, 233, 234, 234, 235, 235, 236, - 236, 236, 237, 237, 238, 238, 238, 239, 239, 240, - 240, 241, 242, 242, 243, 243, 244, 244, 245, 246, - 246, 247, 247, 248, 248, 249, 249, 250, 250, 251, - 251, 251, 252, 252, 253, 253, 254, 254, 255, 255, - 256, 256, 257, 257, 257, 258, 258, 258, 259, 259, - 259, 260, 260, 261, 262, 262, 263, 263, 264, 264, - 265, 265, 266, 266, 266, 267, 267, 267, 268, 268, - 268, 269, 269, 270, 270, 271, 271, 273, 285, 286, - 287, 287, 287, 287, 287, 288, 288, 290, 302, 303, - 304, 304, 304, 304, 305, 305, 307, 321, 322, 323, - 323, 323, 323, 324, 324, 324, 326, 342, 343, 344, - 344, 344, 344, 345, 345, 345, 346, 348, 357, 366, - 377, 386, 395, 404, 415, 424, 435, 448, 463, 474, - 491, 508, 525, 542, 557, 572, 585, 600, 609, 618, - 627, 636, 645, 654, 663, 672, 681, 690, 699, 708, - 717, 730, 739, 752, 761, 770, 779, 786, 793, 802, - 809, 818, 826, 833, 840, 848, 857, 866, 880, 889, - 898, 907, 916, 925, 934, 941, 948, 974, 982, 989, - 996, 1003, 1010, 1018, 1026, 1034, 1041, 1052, 1063, 1070, - 1079, 1088, 1097, 1104, 1111, 1119, 1127, 1137, 1147, 1157, - 1165, 1178, 1189, 1197, 1210, 1219, 1228, 1237, 1247, 1257, - 1265, 1278, 1287, 1295, 1304, 1312, 1325, 1334, 1341, 1351, - 1361, 1371, 1381, 1391, 1401, 1411, 1421, 1428, 1435, 1442, - 1451, 1460, 1469, 1478, 1485, 1495, 1515, 1522, 1540, 1553, - 1566, 1575, 1584, 1593, 1602, 1612, 1622, 1633, 1642, 1651, - 1660, 1669, 1682, 1695, 1704, 1711, 1720, 1729, 1738, 1747, - 1755, 1768, 1776, 1817, 1824, 1839, 1849, 1859, 1866, 1873, - 1880, 1889, 1897, 1911, 1932, 1953, 1965, 1977, 1989, 1998, - 2019, 2029, 2038, 2046, 2054, 2067, 2080, 2095, 2110, 2119, - 2128, 2134, 2143, 2152, 2162, 2172, 2185, 2198, 2210, 2224, - 2236, 2250, 2260, 2267, 2274, 2283, 2292, 2302, 2312, 2322, - 2329, 2336, 2345, 2354, 2364, 2374, 2381, 2388, 2395, 2403, - 2413, 2423, 2433, 2443, 2482, 2492, 2500, 2508, 2523, 2532, - 2537, 2538, 2539, 2539, 2539, 2540, 2540, 2540, 2541, 2541, - 2543, 2553, 2562, 2569, 2576, 2583, 2590, 2597, 2604, 2609, - 2610, 2611, 2611, 2612, 2612, 2613, 2613, 2614, 2615, 2616, - 2617, 2618, 2619, 2621, 2630, 2637, 2646, 2655, 2662, 2669, - 2679, 2689, 2699, 2709, 2719, 2729, 2734, 2735, 2736, 2738, - 2744, 2754, 2761, 2770, 2778, 2783, 2784, 2786, 2786, 2786, - 2787, 2787, 2788, 2789, 2790, 2791, 2792, 2794, 2804, 2813, - 2820, 2829, 2836, 2845, 2853, 2866, 2874, 2887, 2892, 2893, - 2894, 2894, 2895, 2895, 2895, 2897, 2912, 2927, 2939, 2954, - 2967, 2978, 2983, 2984, 2985, 2985, 2987, 3002 + 0, 175, 175, 175, 176, 176, 177, 177, 178, 178, + 178, 179, 179, 180, 180, 181, 185, 190, 191, 192, + 192, 192, 193, 193, 194, 194, 195, 195, 196, 196, + 196, 197, 197, 198, 198, 198, 199, 199, 199, 200, + 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, + 205, 206, 206, 207, 207, 208, 208, 208, 209, 209, + 209, 210, 210, 210, 211, 211, 212, 212, 213, 213, + 214, 214, 215, 215, 215, 216, 216, 217, 217, 218, + 218, 218, 219, 219, 220, 220, 221, 221, 222, 222, + 222, 223, 223, 224, 224, 225, 225, 226, 226, 227, + 227, 228, 228, 228, 229, 229, 230, 230, 230, 231, + 231, 231, 232, 232, 232, 233, 233, 233, 233, 234, + 235, 235, 235, 236, 236, 236, 237, 237, 238, 238, + 239, 239, 239, 240, 240, 241, 241, 241, 242, 242, + 243, 243, 244, 245, 245, 246, 246, 247, 247, 248, + 249, 249, 250, 250, 251, 251, 252, 252, 253, 253, + 254, 254, 254, 255, 255, 256, 256, 257, 257, 258, + 258, 259, 259, 260, 260, 261, 261, 261, 262, 262, + 262, 263, 263, 263, 264, 264, 265, 266, 266, 267, + 267, 268, 268, 269, 269, 270, 270, 270, 271, 271, + 271, 272, 272, 272, 273, 273, 274, 274, 275, 275, + 277, 289, 290, 291, 291, 291, 291, 291, 292, 292, + 294, 306, 307, 308, 308, 308, 308, 309, 309, 311, + 325, 326, 327, 327, 327, 327, 328, 328, 328, 330, + 347, 348, 349, 349, 349, 349, 350, 350, 350, 351, + 354, 373, 390, 398, 408, 416, 433, 434, 435, 435, + 435, 435, 435, 436, 436, 436, 437, 437, 439, 448, + 457, 468, 477, 486, 495, 506, 515, 527, 541, 556, + 567, 584, 601, 618, 635, 650, 665, 678, 693, 702, + 711, 720, 729, 738, 747, 756, 765, 774, 783, 792, + 801, 810, 823, 832, 845, 854, 863, 872, 879, 886, + 895, 902, 911, 919, 926, 933, 941, 950, 959, 973, + 982, 991, 1000, 1009, 1018, 1027, 1034, 1041, 1067, 1075, + 1082, 1089, 1096, 1103, 1111, 1119, 1127, 1134, 1145, 1156, + 1163, 1172, 1181, 1190, 1197, 1204, 1212, 1220, 1230, 1240, + 1250, 1258, 1271, 1282, 1290, 1303, 1312, 1321, 1330, 1340, + 1350, 1358, 1371, 1380, 1388, 1397, 1405, 1418, 1427, 1434, + 1444, 1454, 1464, 1474, 1484, 1494, 1504, 1514, 1521, 1528, + 1535, 1544, 1553, 1562, 1571, 1578, 1588, 1608, 1615, 1633, + 1646, 1659, 1668, 1677, 1686, 1695, 1705, 1715, 1726, 1735, + 1744, 1753, 1762, 1771, 1780, 1793, 1806, 1815, 1822, 1831, + 1840, 1849, 1858, 1866, 1879, 1887, 1928, 1935, 1950, 1960, + 1970, 1977, 1984, 1991, 2000, 2008, 2022, 2043, 2064, 2076, + 2088, 2100, 2109, 2130, 2140, 2149, 2157, 2165, 2178, 2191, + 2206, 2221, 2230, 2239, 2245, 2254, 2263, 2273, 2283, 2296, + 2309, 2321, 2335, 2347, 2361, 2371, 2378, 2385, 2394, 2403, + 2413, 2423, 2433, 2440, 2447, 2456, 2465, 2475, 2485, 2492, + 2499, 2506, 2514, 2524, 2534, 2544, 2554, 2593, 2603, 2611, + 2619, 2634, 2643, 2648, 2649, 2650, 2650, 2650, 2651, 2651, + 2651, 2652, 2652, 2654, 2664, 2673, 2680, 2687, 2694, 2701, + 2708, 2715, 2720, 2721, 2722, 2722, 2723, 2723, 2724, 2724, + 2725, 2726, 2727, 2728, 2729, 2730, 2732, 2741, 2748, 2757, + 2766, 2773, 2780, 2790, 2800, 2810, 2820, 2830, 2840, 2845, + 2846, 2847, 2849, 2855, 2865, 2872, 2881, 2889, 2894, 2895, + 2897, 2897, 2897, 2898, 2898, 2899, 2900, 2901, 2902, 2903, + 2905, 2915, 2924, 2931, 2940, 2947, 2956, 2964, 2977, 2985, + 2998, 3003, 3004, 3005, 3005, 3006, 3006, 3006, 3008, 3020, + 3032, 3044, 3059, 3072, 3083, 3088, 3089, 3090, 3090, 3092, + 3107 }; #endif @@ -1153,7 +1171,8 @@ static const char *const yytname[] = "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_SERVE_EXPIRED_TTL", - "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", + "VAR_SERVE_EXPIRED_TTL_RESET", "VAR_SERVE_EXPIRED_REPLY_TTL", + "VAR_SERVE_EXPIRED_CLIENT_TIMEOUT", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT", @@ -1176,12 +1195,16 @@ static const char *const yytname[] = "VAR_STUB_NO_CACHE", "VAR_LOG_SERVFAIL", "VAR_DENY_ANY", "VAR_UNKNOWN_SERVER_TIME_LIMIT", "VAR_LOG_TAG_QUERYREPLY", "VAR_STREAM_WAIT_SIZE", "VAR_TLS_CIPHERS", "VAR_TLS_CIPHERSUITES", - "VAR_TLS_SESSION_TICKET_KEYS", "VAR_IPSET", "VAR_IPSET_NAME_V4", - "VAR_IPSET_NAME_V6", "$accept", "toplevelvars", "toplevelvar", + "VAR_IPSET", "VAR_IPSET_NAME_V4", "VAR_IPSET_NAME_V6", + "VAR_TLS_SESSION_TICKET_KEYS", "VAR_RPZ", "VAR_TAGS", + "VAR_RPZ_ACTION_OVERRIDE", "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", + "VAR_RPZ_LOG_NAME", "$accept", "toplevelvars", "toplevelvar", "serverstart", "contents_server", "content_server", "stubstart", "contents_stub", "content_stub", "forwardstart", "contents_forward", "content_forward", "viewstart", "contents_view", "content_view", - "authstart", "contents_auth", "content_auth", "server_num_threads", + "authstart", "contents_auth", "content_auth", "rpz_tag", + "rpz_action_override", "rpz_cname_override", "rpz_log", "rpz_log_name", + "rpzstart", "contents_rpz", "content_rpz", "server_num_threads", "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", @@ -1241,6 +1264,7 @@ static const char *const yytname[] = "server_val_permissive_mode", "server_aggressive_nsec", "server_ignore_cd_flag", "server_serve_expired", "server_serve_expired_ttl", "server_serve_expired_ttl_reset", + "server_serve_expired_reply_ttl", "server_serve_expired_client_timeout", "server_fake_dsa", "server_fake_sha1", "server_val_log_level", "server_val_nsec3_keysize_iterations", "server_add_holddown", "server_del_holddown", "server_keep_missing", @@ -1330,7 +1354,8 @@ static const yytype_uint16 yytoknum[] = 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, - 515, 516, 517, 518, 519, 520, 521, 522, 523, 524 + 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, + 525, 526, 527, 528, 529, 530, 531, 532 }; # endif @@ -1350,27 +1375,29 @@ static const yytype_int16 yypact[] = { -262, 0, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, 256, -42, -37, -38, - -41, -44, -136, -102, -191, -177, -261, 2, 3, 28, - 29, 30, 33, 35, 36, 37, 38, 39, 55, 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, 86, 87, 90, 92, - 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 139, 140, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 198, 199, 200, 201, 202, 204, 205, - 207, 209, 211, 212, 213, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 224, 226, 227, 228, 229, - 230, 231, 232, 234, 235, 236, 237, 238, 239, 240, - 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, - 251, 252, 253, 254, 255, 289, -262, -262, -262, -262, + -262, -262, -262, -262, -262, -262, -262, -262, 261, -41, + -36, -40, -20, -42, -29, -128, -105, -170, -221, -261, + 2, 3, 4, 12, 26, 27, 28, 31, 32, 33, + 35, 36, 37, 38, 39, 51, 52, 53, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 85, 87, + 88, 91, 93, 94, 95, 96, 97, 98, 99, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 193, 197, 198, 199, + 200, 201, 202, 203, 205, 206, 207, 208, 211, 212, + 215, 228, 229, 230, 231, 232, 233, 234, 236, 237, + 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 259, 260, 294, 295, 296, 297, 301, 302, 303, 345, + 346, -262, -262, -262, -262, -262, -262, -262, -262, -262, + -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, @@ -1388,49 +1415,50 @@ static const yytype_int16 yypact[] = -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, + -262, -262, -262, 347, 348, 349, 350, 351, 352, 353, + -262, -262, -262, -262, -262, -262, -262, -262, 357, 361, + 362, 387, 388, 389, -262, -262, -262, -262, -262, -262, + -262, 391, 402, 403, 404, 405, 406, 407, -262, -262, + -262, -262, -262, -262, -262, -262, 408, 409, 410, 411, + 412, 413, 414, 453, -262, -262, -262, -262, -262, -262, + -262, -262, -262, 455, 471, 472, 473, 474, -262, -262, + -262, -262, -262, -262, -262, -262, -262, -262, -262, 475, + 476, 477, 478, 479, 480, 481, 488, -262, -262, -262, + -262, -262, -262, -262, -262, -262, 489, 490, 491, 492, + 493, 495, 496, 497, 498, 499, 500, 501, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, 290, 291, 292, 296, - 297, 298, 340, -262, -262, -262, -262, -262, -262, -262, - -262, 341, 342, 343, 344, 345, 346, -262, -262, -262, - -262, -262, -262, -262, 347, 348, 352, 356, 357, 382, - 383, -262, -262, -262, -262, -262, -262, -262, -262, 384, - 386, 397, 398, 399, 400, 401, 402, -262, -262, -262, - -262, -262, -262, -262, -262, -262, 403, 404, 405, 406, - 407, 408, 409, 448, -262, -262, -262, -262, -262, -262, - -262, -262, -262, 450, 464, 465, 466, 467, 468, 469, - 470, 471, 472, 473, 474, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, -262, -262, 481, -262, - -262, 482, 483, 484, 485, 486, 488, 489, 490, 491, - 492, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, 493, 494, 497, 500, 503, -262, -262, -262, - -262, -262, -262, 504, 513, -262, -262, -262, -262, -262, + -262, 504, -262, -262, 507, 510, 511, 519, 520, 521, + 523, 524, 525, 526, -262, -262, -262, -262, -262, -262, + -262, -262, -262, -262, -262, 527, 528, 529, 530, 531, + -262, -262, -262, -262, -262, -262, 532, 533, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, -262, 514, 515, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, + 534, 535, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, 516, 517, 518, -262, -262, -262, - -262, -262, -262, -262, -262, -262, 519, 520, -262, -262, + -262, -262, -262, -262, -262, -262, -262, 536, 537, 538, + -262, -262, -262, -262, -262, -262, -262, -262, -262, 539, + 540, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, -262, 521, 522, 523, - 524, 525, 526, -262, -262, -262, -262, -262, -262, -262, + 541, 542, 543, 544, 545, 546, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, -262, -262, -262, -262, -262, -262, 527, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, + -262, -262, -262, 547, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, 528, -262, -262, 529, 530, -262, -262, -262, -262, + -262, -262, -262, -262, -262, -262, 548, -262, -262, 549, + 550, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, - -262, -262, 531, 532, 533, -262, -262, -262, -262, -262, + -262, -262, 551, 552, 553, -262, -262, -262, -262, -262, -262, -262, -262 }; @@ -1439,10 +1467,10 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 15, 207, 217, 459, 505, 478, 226, - 514, 537, 236, 551, 3, 17, 209, 219, 228, 238, - 461, 480, 507, 516, 539, 553, 4, 5, 6, 10, - 14, 8, 9, 7, 11, 12, 13, 0, 0, 0, + 2, 0, 1, 16, 210, 220, 482, 528, 501, 229, + 537, 560, 239, 574, 255, 3, 18, 212, 222, 231, + 241, 257, 484, 503, 530, 539, 562, 576, 4, 5, + 6, 10, 14, 15, 8, 9, 7, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1461,68 +1489,71 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 16, 18, 19, 81, - 84, 93, 178, 179, 20, 145, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 32, 72, 21, 85, 86, - 43, 65, 80, 22, 23, 25, 26, 24, 27, 28, - 29, 30, 31, 116, 190, 117, 119, 120, 121, 192, - 197, 193, 204, 205, 206, 174, 82, 71, 97, 114, - 115, 202, 199, 118, 33, 34, 35, 36, 37, 73, - 87, 88, 103, 59, 69, 60, 182, 183, 98, 53, - 54, 181, 55, 56, 107, 111, 125, 134, 159, 203, - 108, 66, 38, 39, 40, 95, 126, 127, 128, 41, - 42, 44, 45, 47, 48, 46, 132, 49, 50, 51, - 57, 76, 112, 90, 133, 83, 155, 91, 92, 109, - 110, 200, 96, 52, 74, 77, 58, 61, 99, 100, - 75, 156, 101, 62, 63, 64, 191, 113, 169, 170, - 171, 172, 180, 102, 70, 104, 105, 106, 157, 67, - 68, 89, 78, 79, 94, 122, 123, 201, 124, 129, - 130, 131, 160, 161, 163, 165, 166, 164, 167, 175, - 135, 136, 139, 140, 137, 138, 141, 142, 144, 143, - 194, 196, 195, 158, 168, 184, 186, 185, 187, 188, - 189, 162, 173, 176, 177, 198, 0, 0, 0, 0, - 0, 0, 0, 208, 210, 211, 212, 214, 215, 216, - 213, 0, 0, 0, 0, 0, 0, 218, 220, 221, - 222, 223, 224, 225, 0, 0, 0, 0, 0, 0, - 0, 227, 229, 230, 233, 234, 231, 235, 232, 0, - 0, 0, 0, 0, 0, 0, 0, 237, 239, 240, - 241, 242, 246, 243, 244, 245, 0, 0, 0, 0, - 0, 0, 0, 0, 460, 462, 464, 463, 469, 465, - 466, 467, 468, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 479, 481, 482, 483, 484, - 485, 486, 487, 488, 489, 490, 491, 492, 0, 506, - 508, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 515, 517, 518, 519, 521, 522, 520, 523, 524, - 525, 526, 0, 0, 0, 0, 0, 538, 540, 541, - 542, 543, 544, 0, 0, 552, 554, 555, 248, 247, - 254, 267, 265, 273, 274, 277, 275, 276, 278, 279, - 280, 281, 282, 304, 305, 306, 307, 308, 332, 333, - 334, 339, 340, 270, 341, 342, 345, 343, 344, 347, - 348, 349, 363, 319, 320, 322, 323, 350, 366, 313, - 315, 367, 373, 374, 375, 271, 331, 389, 390, 314, - 384, 297, 266, 309, 364, 370, 351, 0, 0, 393, - 272, 249, 296, 355, 250, 268, 269, 310, 311, 391, - 353, 357, 358, 251, 394, 335, 362, 298, 318, 368, - 369, 372, 383, 312, 387, 385, 386, 324, 330, 359, - 360, 325, 326, 352, 377, 299, 300, 303, 283, 285, - 286, 287, 288, 289, 395, 396, 398, 336, 337, 338, - 346, 399, 400, 401, 0, 0, 0, 354, 327, 510, - 410, 414, 412, 411, 415, 413, 0, 0, 418, 419, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 356, 371, 388, 423, 424, 328, 402, 0, 0, 0, - 0, 0, 0, 378, 379, 380, 381, 382, 511, 321, - 316, 376, 295, 252, 253, 317, 425, 427, 426, 428, - 429, 430, 284, 291, 420, 422, 421, 290, 0, 302, - 361, 397, 301, 329, 292, 293, 294, 431, 432, 433, - 437, 436, 434, 435, 438, 439, 440, 441, 443, 442, - 452, 0, 456, 457, 0, 0, 458, 444, 450, 445, - 446, 447, 449, 451, 448, 470, 472, 471, 474, 475, - 476, 477, 473, 493, 494, 495, 496, 497, 498, 499, - 500, 501, 502, 503, 504, 509, 527, 528, 529, 532, - 530, 531, 533, 534, 535, 536, 545, 546, 547, 548, - 549, 556, 557, 365, 392, 409, 512, 513, 416, 417, - 403, 404, 0, 0, 0, 408, 550, 453, 454, 455, - 407, 405, 406 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 17, 19, 20, 82, 85, 94, 181, 182, 21, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 33, 73, 22, 86, 87, 44, 66, 81, 23, 24, + 26, 27, 25, 28, 29, 30, 31, 32, 117, 193, + 118, 120, 121, 122, 195, 200, 196, 207, 208, 209, + 177, 83, 72, 98, 115, 116, 205, 202, 119, 34, + 35, 36, 37, 38, 74, 88, 89, 104, 60, 70, + 61, 185, 186, 99, 54, 55, 184, 56, 57, 108, + 112, 126, 135, 160, 206, 109, 67, 39, 40, 41, + 96, 127, 128, 129, 42, 43, 45, 46, 48, 49, + 47, 133, 50, 51, 52, 58, 77, 113, 91, 134, + 84, 156, 92, 93, 110, 111, 203, 97, 53, 75, + 78, 59, 62, 100, 101, 76, 157, 102, 63, 64, + 65, 194, 114, 170, 171, 172, 173, 174, 175, 183, + 103, 71, 105, 106, 107, 158, 68, 69, 90, 79, + 80, 95, 123, 124, 204, 125, 130, 131, 132, 161, + 162, 164, 166, 167, 165, 168, 178, 136, 137, 140, + 141, 138, 139, 142, 143, 145, 144, 197, 199, 198, + 159, 169, 187, 189, 188, 190, 191, 192, 163, 176, + 179, 180, 201, 0, 0, 0, 0, 0, 0, 0, + 211, 213, 214, 215, 217, 218, 219, 216, 0, 0, + 0, 0, 0, 0, 221, 223, 224, 225, 226, 227, + 228, 0, 0, 0, 0, 0, 0, 0, 230, 232, + 233, 236, 237, 234, 238, 235, 0, 0, 0, 0, + 0, 0, 0, 0, 240, 242, 243, 244, 245, 249, + 246, 247, 248, 0, 0, 0, 0, 0, 260, 264, + 265, 266, 267, 256, 258, 259, 261, 262, 263, 0, + 0, 0, 0, 0, 0, 0, 0, 483, 485, 487, + 486, 492, 488, 489, 490, 491, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 502, 504, + 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, + 515, 0, 529, 531, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 538, 540, 541, 542, 544, 545, + 543, 546, 547, 548, 549, 0, 0, 0, 0, 0, + 561, 563, 564, 565, 566, 567, 0, 0, 575, 577, + 578, 269, 268, 275, 288, 286, 294, 295, 298, 296, + 297, 299, 300, 301, 302, 303, 325, 326, 327, 328, + 329, 353, 354, 355, 360, 361, 291, 362, 363, 366, + 364, 365, 368, 369, 370, 384, 340, 341, 343, 344, + 371, 387, 334, 336, 388, 394, 395, 396, 292, 352, + 412, 413, 335, 407, 318, 287, 330, 385, 391, 372, + 0, 0, 416, 293, 270, 317, 376, 271, 289, 290, + 331, 332, 414, 374, 378, 379, 272, 417, 356, 383, + 319, 339, 389, 390, 393, 406, 333, 410, 408, 409, + 345, 351, 380, 381, 346, 347, 373, 398, 320, 321, + 324, 304, 306, 307, 308, 309, 310, 418, 419, 421, + 357, 358, 359, 367, 422, 423, 424, 0, 0, 0, + 375, 348, 533, 433, 437, 435, 434, 438, 436, 0, + 0, 441, 442, 276, 277, 278, 279, 280, 281, 282, + 283, 284, 285, 377, 392, 411, 446, 447, 349, 425, + 0, 0, 0, 0, 0, 0, 399, 400, 401, 402, + 403, 404, 405, 534, 342, 337, 397, 316, 273, 274, + 338, 448, 450, 449, 451, 452, 453, 305, 312, 443, + 445, 444, 311, 0, 323, 382, 420, 322, 350, 313, + 314, 315, 454, 455, 456, 460, 459, 457, 458, 461, + 462, 463, 464, 466, 465, 475, 0, 479, 480, 0, + 0, 481, 467, 473, 468, 469, 470, 472, 474, 471, + 250, 251, 252, 253, 254, 493, 495, 494, 497, 498, + 499, 500, 496, 516, 517, 518, 519, 520, 521, 522, + 523, 524, 525, 526, 527, 532, 550, 551, 552, 555, + 553, 554, 556, 557, 558, 559, 568, 569, 570, 571, + 572, 579, 580, 386, 415, 432, 535, 536, 439, 440, + 426, 427, 0, 0, 0, 431, 573, 476, 477, 478, + 430, 428, 429 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1550,6 +1581,7 @@ static const yytype_int16 yypgoto[] = -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, + -262, -262, -262, -262, -262, -23, 554, 555, 556, 557, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, -262, @@ -1563,36 +1595,37 @@ static const yytype_int16 yypgoto[] = /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 14, 15, 26, 226, 16, 27, 423, 17, - 28, 437, 18, 29, 451, 19, 30, 467, 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, 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, 424, 425, 426, 427, 428, 429, 430, 438, - 439, 440, 441, 442, 443, 468, 469, 470, 471, 472, - 473, 474, 475, 452, 453, 454, 455, 456, 457, 458, - 20, 31, 484, 485, 486, 487, 488, 489, 490, 491, - 492, 21, 32, 505, 506, 507, 508, 509, 510, 511, - 512, 513, 514, 515, 516, 517, 22, 33, 519, 520, - 411, 412, 413, 414, 23, 34, 531, 532, 533, 534, - 535, 536, 537, 538, 539, 540, 541, 24, 35, 547, - 548, 549, 550, 551, 552, 415, 25, 36, 555, 556, - 557 + -1, 1, 15, 16, 28, 231, 17, 29, 430, 18, + 30, 444, 19, 31, 458, 20, 32, 474, 488, 489, + 490, 491, 492, 21, 33, 493, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, + 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, + 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, + 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, + 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, + 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, + 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, + 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, + 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, + 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, + 416, 417, 431, 432, 433, 434, 435, 436, 437, 445, + 446, 447, 448, 449, 450, 475, 476, 477, 478, 479, + 480, 481, 482, 459, 460, 461, 462, 463, 464, 465, + 22, 34, 507, 508, 509, 510, 511, 512, 513, 514, + 515, 23, 35, 528, 529, 530, 531, 532, 533, 534, + 535, 536, 537, 538, 539, 540, 24, 36, 542, 543, + 418, 419, 420, 421, 25, 37, 554, 555, 556, 557, + 558, 559, 560, 561, 562, 563, 564, 26, 38, 570, + 571, 572, 573, 574, 575, 422, 27, 39, 578, 579, + 580 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1600,182 +1633,195 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 416, 459, 417, 418, 444, 431, 553, 554, 518, - 0, 3, 558, 559, 432, 433, 493, 494, 495, 496, - 497, 498, 499, 500, 501, 502, 503, 504, 521, 522, - 523, 524, 525, 526, 527, 528, 529, 530, 560, 561, - 562, 445, 446, 563, 4, 564, 565, 566, 567, 568, - 5, 476, 477, 478, 479, 480, 481, 482, 483, 542, - 543, 544, 545, 546, 419, 569, 447, 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, 596, 6, 420, 597, 598, 421, 434, - 599, 435, 600, 601, 602, 603, 604, 605, 606, 607, - 7, 608, 609, 610, 611, 612, 613, 614, 615, 616, - 617, 618, 619, 620, 621, 622, 623, 448, 449, 624, - 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, - 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, - 645, 8, 646, 647, 648, 649, 650, 651, 652, 653, - 654, 655, 656, 657, 658, 659, 450, 660, 661, 662, - 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, - 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, - 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, - 693, 460, 9, 461, 462, 463, 464, 465, 694, 695, - 696, 697, 698, 466, 699, 700, 422, 701, 10, 702, - 436, 703, 704, 705, 706, 707, 708, 709, 710, 711, - 712, 713, 714, 715, 716, 11, 717, 718, 719, 720, - 721, 722, 723, 12, 724, 725, 726, 727, 728, 729, - 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, - 740, 741, 742, 743, 744, 745, 0, 13, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 746, - 747, 748, 749, 68, 69, 70, 750, 751, 752, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 753, 754, 755, 756, 757, 758, 759, 760, 761, 112, - 113, 114, 762, 115, 116, 117, 763, 764, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 765, 766, 767, 142, 768, 143, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 769, 770, 771, - 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 782, 191, - 783, 192, 193, 194, 195, 196, 197, 198, 199, 200, - 201, 202, 203, 204, 784, 785, 786, 787, 788, 789, - 790, 791, 792, 793, 794, 205, 206, 207, 208, 209, - 210, 795, 796, 797, 798, 799, 800, 211, 801, 802, - 803, 804, 805, 806, 807, 212, 213, 808, 214, 215, - 809, 216, 217, 810, 811, 218, 219, 220, 221, 222, - 223, 224, 225, 812, 813, 814, 815, 816, 817, 818, - 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, - 829, 830, 831, 832 + 2, 466, 423, 451, 424, 425, 541, 438, 576, 577, + 494, 3, 581, 582, 583, 439, 440, 565, 566, 567, + 568, 569, 584, 466, 516, 517, 518, 519, 520, 521, + 522, 523, 524, 525, 526, 527, 585, 586, 587, 452, + 453, 588, 589, 590, 4, 591, 592, 593, 594, 595, + 5, 544, 545, 546, 547, 548, 549, 550, 551, 552, + 553, 596, 597, 598, 454, 426, 499, 500, 501, 502, + 503, 504, 505, 506, 599, 600, 601, 602, 603, 604, + 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, + 615, 616, 617, 618, 6, 619, 427, 620, 621, 428, + 441, 622, 442, 623, 624, 625, 626, 627, 628, 629, + 7, 630, 631, 632, 633, 634, 635, 636, 637, 638, + 639, 640, 641, 642, 643, 455, 456, 644, 645, 646, + 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, + 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, + 667, 8, 668, 669, 670, 671, 672, 673, 674, 675, + 676, 677, 678, 679, 457, 680, 681, 682, 683, 684, + 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, + 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, + 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, + 715, 716, 9, 717, 468, 469, 470, 718, 719, 720, + 721, 722, 723, 724, 473, 725, 726, 727, 728, 429, + 10, 729, 730, 443, 467, 731, 468, 469, 470, 471, + 472, 483, 484, 485, 486, 487, 473, 11, 732, 733, + 734, 735, 736, 737, 738, 12, 739, 740, 741, 742, + 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, + 753, 754, 755, 756, 757, 758, 759, 760, 13, 761, + 762, 0, 14, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, + 67, 68, 69, 70, 763, 764, 765, 766, 71, 72, + 73, 767, 768, 769, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, + 775, 776, 777, 778, 115, 116, 117, 779, 118, 119, + 120, 780, 781, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 782, 783, 784, + 145, 785, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 786, 787, 788, 789, 790, 791, 792, 793, + 794, 795, 796, 797, 798, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 799, 194, 800, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, + 209, 801, 802, 803, 804, 805, 806, 807, 808, 809, + 810, 811, 210, 211, 212, 213, 214, 215, 812, 813, + 814, 815, 816, 817, 216, 818, 819, 820, 821, 822, + 823, 824, 217, 218, 825, 219, 220, 826, 221, 222, + 827, 828, 223, 224, 225, 226, 227, 228, 229, 829, + 830, 831, 230, 832, 833, 834, 835, 836, 837, 838, + 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, + 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, + 859, 860, 861, 862, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 495, 496, 497, + 498 }; static const yytype_int16 yycheck[] = { - 0, 43, 43, 45, 46, 43, 43, 268, 269, 111, - -1, 11, 10, 10, 51, 52, 152, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 219, 220, - 221, 222, 223, 224, 225, 226, 227, 228, 10, 10, - 10, 79, 80, 10, 44, 10, 10, 10, 10, 10, - 50, 95, 96, 97, 98, 99, 100, 101, 102, 236, - 237, 238, 239, 240, 106, 10, 104, 10, 10, 10, + 0, 43, 43, 43, 45, 46, 111, 43, 269, 270, + 33, 11, 10, 10, 10, 51, 52, 238, 239, 240, + 241, 242, 10, 43, 152, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 10, 10, 10, 79, + 80, 10, 10, 10, 44, 10, 10, 10, 10, 10, + 50, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 10, 10, 10, 104, 106, 95, 96, 97, 98, + 99, 100, 101, 102, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 94, 137, 10, 10, 140, 136, - 10, 138, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 94, 10, 137, 10, 10, 140, + 136, 10, 138, 10, 10, 10, 10, 10, 10, 10, 110, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 165, 166, 10, + 10, 10, 10, 10, 10, 165, 166, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 151, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 204, 10, 10, 10, + 10, 10, 10, 10, 204, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 242, 202, 244, 245, 246, 247, 248, 10, 10, - 10, 10, 10, 254, 10, 10, 258, 10, 218, 10, - 257, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 235, 10, 10, 10, 10, - 10, 10, 10, 243, 10, 10, 10, 10, 10, 10, + 10, 10, 202, 10, 246, 247, 248, 10, 10, 10, + 10, 10, 10, 10, 256, 10, 10, 10, 10, 260, + 220, 10, 10, 259, 244, 10, 246, 247, 248, 249, + 250, 273, 274, 275, 276, 277, 256, 237, 10, 10, + 10, 10, 10, 10, 10, 245, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, -1, 267, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 10, - 10, 10, 10, 47, 48, 49, 10, 10, 10, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 103, - 104, 105, 10, 107, 108, 109, 10, 10, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 10, 10, 10, 139, 10, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 268, 10, + 10, -1, 272, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 10, 10, 10, 10, 47, 48, + 49, 10, 10, 10, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 103, 104, 105, 10, 107, 108, + 109, 10, 10, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 10, 10, 10, + 139, 10, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 201, 10, 203, 10, 205, 206, 207, 208, + 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, + 219, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 231, 232, 233, 234, 235, 236, 10, 10, + 10, 10, 10, 10, 243, 10, 10, 10, 10, 10, + 10, 10, 251, 252, 10, 254, 255, 10, 257, 258, + 10, 10, 261, 262, 263, 264, 265, 266, 267, 10, + 10, 10, 271, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 10, 203, - 10, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 229, 230, 231, 232, 233, - 234, 10, 10, 10, 10, 10, 10, 241, 10, 10, - 10, 10, 10, 10, 10, 249, 250, 10, 252, 253, - 10, 255, 256, 10, 10, 259, 260, 261, 262, 263, - 264, 265, 266, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10 + 10, 10, 10, 10, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 33, 33, 33, + 33 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 271, 0, 11, 44, 50, 94, 110, 151, 202, - 218, 235, 243, 267, 272, 273, 276, 279, 282, 285, - 500, 511, 526, 534, 547, 556, 274, 277, 280, 283, - 286, 501, 512, 527, 535, 548, 557, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 47, 48, - 49, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 103, 104, 105, 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, 135, 139, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, - 201, 203, 205, 206, 207, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 229, 230, 231, 232, 233, - 234, 241, 249, 250, 252, 253, 255, 256, 259, 260, - 261, 262, 263, 264, 265, 266, 275, 288, 289, 290, - 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, - 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, - 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, - 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, - 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, - 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, - 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, - 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, - 471, 530, 531, 532, 533, 555, 43, 45, 46, 106, - 137, 140, 258, 278, 472, 473, 474, 475, 476, 477, - 478, 43, 51, 52, 136, 138, 257, 281, 479, 480, - 481, 482, 483, 484, 43, 79, 80, 104, 165, 166, - 204, 284, 493, 494, 495, 496, 497, 498, 499, 43, - 242, 244, 245, 246, 247, 248, 254, 287, 485, 486, - 487, 488, 489, 490, 491, 492, 95, 96, 97, 98, - 99, 100, 101, 102, 502, 503, 504, 505, 506, 507, - 508, 509, 510, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 513, 514, 515, 516, 517, - 518, 519, 520, 521, 522, 523, 524, 525, 111, 528, - 529, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 236, 237, 238, 239, 240, 549, 550, 551, - 552, 553, 554, 268, 269, 558, 559, 560, 10, 10, + 0, 279, 0, 11, 44, 50, 94, 110, 151, 202, + 220, 237, 245, 268, 272, 280, 281, 284, 287, 290, + 293, 301, 518, 529, 544, 552, 565, 574, 282, 285, + 288, 291, 294, 302, 519, 530, 545, 553, 566, 575, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 47, 48, 49, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 103, 104, 105, 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, 135, 139, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 203, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 231, 232, 233, 234, 235, 236, 243, 251, 252, 254, + 255, 257, 258, 261, 262, 263, 264, 265, 266, 267, + 271, 283, 304, 305, 306, 307, 308, 309, 310, 311, + 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, + 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, + 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, + 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, + 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, + 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, + 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, + 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, + 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, + 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, + 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, + 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, + 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, + 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, + 482, 483, 484, 485, 486, 487, 488, 489, 548, 549, + 550, 551, 573, 43, 45, 46, 106, 137, 140, 260, + 286, 490, 491, 492, 493, 494, 495, 496, 43, 51, + 52, 136, 138, 259, 289, 497, 498, 499, 500, 501, + 502, 43, 79, 80, 104, 165, 166, 204, 292, 511, + 512, 513, 514, 515, 516, 517, 43, 244, 246, 247, + 248, 249, 250, 256, 295, 503, 504, 505, 506, 507, + 508, 509, 510, 273, 274, 275, 276, 277, 296, 297, + 298, 299, 300, 303, 503, 504, 505, 506, 507, 95, + 96, 97, 98, 99, 100, 101, 102, 520, 521, 522, + 523, 524, 525, 526, 527, 528, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 531, 532, + 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, + 543, 111, 546, 547, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 554, 555, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 238, 239, 240, 241, 242, + 567, 568, 569, 570, 571, 572, 269, 270, 576, 577, + 578, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1809,69 +1855,72 @@ static const yytype_uint16 yystos[] = /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 270, 271, 271, 272, 272, 272, 272, 272, 272, - 272, 272, 272, 272, 272, 273, 274, 274, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - 275, 275, 275, 275, 275, 275, 275, 276, 277, 277, - 278, 278, 278, 278, 278, 278, 278, 279, 280, 280, - 281, 281, 281, 281, 281, 281, 282, 283, 283, 284, - 284, 284, 284, 284, 284, 284, 285, 286, 286, 287, - 287, 287, 287, 287, 287, 287, 287, 288, 289, 290, - 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, - 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, - 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, - 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, - 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, - 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, - 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, - 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, - 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, - 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, - 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, - 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, - 501, 501, 502, 502, 502, 502, 502, 502, 502, 502, - 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, - 512, 513, 513, 513, 513, 513, 513, 513, 513, 513, - 513, 513, 513, 514, 515, 516, 517, 518, 519, 520, - 521, 522, 523, 524, 525, 526, 527, 527, 528, 529, - 530, 531, 532, 533, 534, 535, 535, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 537, 538, 539, - 540, 541, 542, 543, 544, 545, 546, 547, 548, 548, - 549, 549, 549, 549, 549, 550, 551, 552, 553, 554, - 555, 556, 557, 557, 558, 558, 559, 560 + 0, 278, 279, 279, 280, 280, 280, 280, 280, 280, + 280, 280, 280, 280, 280, 280, 281, 282, 282, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, + 284, 285, 285, 286, 286, 286, 286, 286, 286, 286, + 287, 288, 288, 289, 289, 289, 289, 289, 289, 290, + 291, 291, 292, 292, 292, 292, 292, 292, 292, 293, + 294, 294, 295, 295, 295, 295, 295, 295, 295, 295, + 296, 297, 298, 299, 300, 301, 302, 302, 303, 303, + 303, 303, 303, 303, 303, 303, 303, 303, 304, 305, + 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, + 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, + 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, + 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, + 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, + 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, + 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, + 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, + 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, + 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, + 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, + 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, + 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, + 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, + 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, + 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, + 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, + 516, 517, 518, 519, 519, 520, 520, 520, 520, 520, + 520, 520, 520, 521, 522, 523, 524, 525, 526, 527, + 528, 529, 530, 530, 531, 531, 531, 531, 531, 531, + 531, 531, 531, 531, 531, 531, 532, 533, 534, 535, + 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, + 545, 546, 547, 548, 549, 550, 551, 552, 553, 553, + 554, 554, 554, 554, 554, 554, 554, 554, 554, 554, + 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, + 565, 566, 566, 567, 567, 567, 567, 567, 568, 569, + 570, 571, 572, 573, 574, 575, 575, 576, 576, 577, + 578 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 0, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, + 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1890,12 +1939,13 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1906,26 +1956,28 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 4, 4, 4, 3, 3, - 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 3, 3, 4, 4, + 4, 3, 3, 2, 2, 2, 2, 2, 2, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 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, + 2, 2, 2, 2, 2, 2, 3, 3, 3, 2, + 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 0, 1, 2, - 2, 2, 3, 3, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, - 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, - 3, 1, 2, 0, 1, 1, 2, 2 + 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, 1, 1, 1, 2, 2, + 2, 2, 2, 3, 1, 2, 0, 1, 1, 2, + 2 }; @@ -1941,22 +1993,22 @@ static const yytype_uint8 yyr2[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) /* Error token number */ #define YYTERROR 1 @@ -1996,37 +2048,37 @@ do { \ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YYUSE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YYUSE (yytype); } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", + YYFPRINTF (yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yytype, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -2060,7 +2112,7 @@ do { \ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -2071,7 +2123,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) + &yyvsp[(yyi + 1) - (yynrhs)] ); YYFPRINTF (stderr, "\n"); } @@ -2175,7 +2227,10 @@ yytnamerr (char *yyres, const char *yystr) case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -2193,7 +2248,7 @@ yytnamerr (char *yyres, const char *yystr) if (! yyres) return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; + return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); } # endif @@ -2271,10 +2326,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yyarg[yycount++] = yytname[yyx]; { YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } } } @@ -2286,6 +2341,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -2297,9 +2353,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, { YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } if (*yymsg_alloc < yysize) @@ -2425,23 +2482,33 @@ yyparse (void) yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yynewstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + *yyssp = (yytype_int16) yystate; if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into @@ -2457,14 +2524,10 @@ yyparse (void) &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -2480,35 +2543,33 @@ yyparse (void) goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ if (yystate == YYFINAL) YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -2566,7 +2627,6 @@ yybackup: YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END - goto yynewstate; @@ -2581,7 +2641,7 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -2601,16 +2661,16 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 15: -#line 183 "util/configparser.y" /* yacc.c:1646 */ + case 16: +#line 186 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } -#line 2610 "util/configparser.c" /* yacc.c:1646 */ +#line 2670 "util/configparser.c" break; - case 207: -#line 274 "util/configparser.y" /* yacc.c:1646 */ + case 210: +#line 278 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2621,11 +2681,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2625 "util/configparser.c" /* yacc.c:1646 */ +#line 2685 "util/configparser.c" break; - case 217: -#line 291 "util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 295 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2636,11 +2696,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2640 "util/configparser.c" /* yacc.c:1646 */ +#line 2700 "util/configparser.c" break; - case 226: -#line 308 "util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 312 "util/configparser.y" { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2653,11 +2713,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2657 "util/configparser.c" /* yacc.c:1646 */ +#line 2717 "util/configparser.c" break; - case 236: -#line 327 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 331 "util/configparser.y" { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2669,14 +2729,107 @@ yyreduce: s->for_downstream = 1; s->for_upstream = 1; s->fallback_enabled = 0; + s->isrpz = 0; + } else + yyerror("out of memory"); + } +#line 2737 "util/configparser.c" + break; + + case 250: +#line 355 "util/configparser.y" + { + uint8_t* bitlist; + size_t len = 0; + OUTYY(("P(server_local_zone_tag:%s)\n", (yyvsp[0].str))); + bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), + &len); + free((yyvsp[0].str)); + if(!bitlist) { + yyerror("could not parse tags, (define-tag them first)"); + } + if(bitlist) { + cfg_parser->cfg->auths->rpz_taglist = bitlist; + cfg_parser->cfg->auths->rpz_taglistlen = len; + + } + } +#line 2758 "util/configparser.c" + break; + + case 251: +#line 374 "util/configparser.y" + { + OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 && + strcmp((yyvsp[0].str), "passthru")!=0 && strcmp((yyvsp[0].str), "drop")!=0 && + strcmp((yyvsp[0].str), "cname")!=0 && strcmp((yyvsp[0].str), "disabled")!=0) { + yyerror("rpz-action-override action: expected nxdomain, " + "nodata, passthru, drop, cname or disabled"); + free((yyvsp[0].str)); + cfg_parser->cfg->auths->rpz_action_override = NULL; + } + else { + cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str); + } + } +#line 2777 "util/configparser.c" + break; + + case 252: +#line 391 "util/configparser.y" + { + OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str))); + free(cfg_parser->cfg->auths->rpz_cname); + cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str); + } +#line 2787 "util/configparser.c" + break; + + case 253: +#line 399 "util/configparser.y" + { + OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2799 "util/configparser.c" + break; + + case 254: +#line 409 "util/configparser.y" + { + OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str))); + free(cfg_parser->cfg->auths->rpz_log_name); + cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str); + } +#line 2809 "util/configparser.c" + break; + + case 255: +#line 417 "util/configparser.y" + { + struct config_auth* s; + OUTYY(("\nP(rpz:)\n")); + s = (struct config_auth*)calloc(1, sizeof(struct config_auth)); + if(s) { + s->next = cfg_parser->cfg->auths; + cfg_parser->cfg->auths = s; + /* defaults for RPZ auth zone */ + s->for_downstream = 0; + s->for_upstream = 0; + s->fallback_enabled = 0; + s->isrpz = 1; } else yyerror("out of memory"); } -#line 2676 "util/configparser.c" /* yacc.c:1646 */ +#line 2829 "util/configparser.c" break; - case 247: -#line 349 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 440 "util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2684,11 +2837,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2688 "util/configparser.c" /* yacc.c:1646 */ +#line 2841 "util/configparser.c" break; - case 248: -#line 358 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 449 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2696,11 +2849,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2700 "util/configparser.c" /* yacc.c:1646 */ +#line 2853 "util/configparser.c" break; - case 249: -#line 367 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 458 "util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2710,11 +2863,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2714 "util/configparser.c" /* yacc.c:1646 */ +#line 2867 "util/configparser.c" break; - case 250: -#line 378 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 469 "util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2722,11 +2875,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2726 "util/configparser.c" /* yacc.c:1646 */ +#line 2879 "util/configparser.c" break; - case 251: -#line 387 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 478 "util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2734,11 +2887,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2738 "util/configparser.c" /* yacc.c:1646 */ +#line 2891 "util/configparser.c" break; - case 252: -#line 396 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 487 "util/configparser.y" { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2746,11 +2899,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2750 "util/configparser.c" /* yacc.c:1646 */ +#line 2903 "util/configparser.c" break; - case 253: -#line 405 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 496 "util/configparser.y" { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2760,11 +2913,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2764 "util/configparser.c" /* yacc.c:1646 */ +#line 2917 "util/configparser.c" break; - case 254: -#line 416 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 507 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2772,11 +2925,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2776 "util/configparser.c" /* yacc.c:1646 */ +#line 2929 "util/configparser.c" break; - case 255: -#line 425 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 516 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2784,13 +2937,14 @@ yyreduce: fatal_exit("out of memory adding client-subnet"); #else OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); + free((yyvsp[0].str)); #endif } -#line 2790 "util/configparser.c" /* yacc.c:1646 */ +#line 2944 "util/configparser.c" break; - case 256: -#line 436 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 528 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2799,13 +2953,14 @@ yyreduce: fatal_exit("out of memory adding client-subnet-zone"); #else OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); + free((yyvsp[0].str)); #endif } -#line 2805 "util/configparser.c" /* yacc.c:1646 */ +#line 2960 "util/configparser.c" break; - case 257: -#line 449 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 542 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2819,11 +2974,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2823 "util/configparser.c" /* yacc.c:1646 */ +#line 2978 "util/configparser.c" break; - case 258: -#line 464 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 557 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2833,11 +2988,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2837 "util/configparser.c" /* yacc.c:1646 */ +#line 2992 "util/configparser.c" break; - case 259: -#line 475 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 568 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2853,11 +3008,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2857 "util/configparser.c" /* yacc.c:1646 */ +#line 3012 "util/configparser.c" break; - case 260: -#line 492 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 585 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2873,11 +3028,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2877 "util/configparser.c" /* yacc.c:1646 */ +#line 3032 "util/configparser.c" break; - case 261: -#line 509 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 602 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2893,11 +3048,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2897 "util/configparser.c" /* yacc.c:1646 */ +#line 3052 "util/configparser.c" break; - case 262: -#line 526 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 619 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2913,11 +3068,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2917 "util/configparser.c" /* yacc.c:1646 */ +#line 3072 "util/configparser.c" break; - case 263: -#line 543 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 636 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str))); @@ -2931,11 +3086,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2935 "util/configparser.c" /* yacc.c:1646 */ +#line 3090 "util/configparser.c" break; - case 264: -#line 558 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 651 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str))); @@ -2949,11 +3104,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2953 "util/configparser.c" /* yacc.c:1646 */ +#line 3108 "util/configparser.c" break; - case 265: -#line 573 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 666 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2965,11 +3120,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2969 "util/configparser.c" /* yacc.c:1646 */ +#line 3124 "util/configparser.c" break; - case 266: -#line 586 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 679 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2983,11 +3138,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2987 "util/configparser.c" /* yacc.c:1646 */ +#line 3142 "util/configparser.c" break; - case 267: -#line 601 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 694 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2995,11 +3150,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2999 "util/configparser.c" /* yacc.c:1646 */ +#line 3154 "util/configparser.c" break; - case 268: -#line 610 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 703 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -3007,11 +3162,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3011 "util/configparser.c" /* yacc.c:1646 */ +#line 3166 "util/configparser.c" break; - case 269: -#line 619 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 712 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -3019,11 +3174,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3023 "util/configparser.c" /* yacc.c:1646 */ +#line 3178 "util/configparser.c" break; - case 270: -#line 628 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 721 "util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3031,11 +3186,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3035 "util/configparser.c" /* yacc.c:1646 */ +#line 3190 "util/configparser.c" break; - case 271: -#line 637 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 730 "util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3043,11 +3198,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3047 "util/configparser.c" /* yacc.c:1646 */ +#line 3202 "util/configparser.c" break; - case 272: -#line 646 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 739 "util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3055,11 +3210,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3059 "util/configparser.c" /* yacc.c:1646 */ +#line 3214 "util/configparser.c" break; - case 273: -#line 655 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 748 "util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3067,11 +3222,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3071 "util/configparser.c" /* yacc.c:1646 */ +#line 3226 "util/configparser.c" break; - case 274: -#line 664 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 757 "util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3079,11 +3234,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3083 "util/configparser.c" /* yacc.c:1646 */ +#line 3238 "util/configparser.c" break; - case 275: -#line 673 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 766 "util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3091,11 +3246,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3095 "util/configparser.c" /* yacc.c:1646 */ +#line 3250 "util/configparser.c" break; - case 276: -#line 682 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 775 "util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3103,11 +3258,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3107 "util/configparser.c" /* yacc.c:1646 */ +#line 3262 "util/configparser.c" break; - case 277: -#line 691 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 784 "util/configparser.y" { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3115,11 +3270,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3119 "util/configparser.c" /* yacc.c:1646 */ +#line 3274 "util/configparser.c" break; - case 278: -#line 700 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 793 "util/configparser.y" { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3127,11 +3282,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3131 "util/configparser.c" /* yacc.c:1646 */ +#line 3286 "util/configparser.c" break; - case 279: -#line 709 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 802 "util/configparser.y" { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3139,11 +3294,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3143 "util/configparser.c" /* yacc.c:1646 */ +#line 3298 "util/configparser.c" break; - case 280: -#line 718 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 811 "util/configparser.y" { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3155,11 +3310,11 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3159 "util/configparser.c" /* yacc.c:1646 */ +#line 3314 "util/configparser.c" break; - case 281: -#line 731 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 824 "util/configparser.y" { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3167,11 +3322,11 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3171 "util/configparser.c" /* yacc.c:1646 */ +#line 3326 "util/configparser.c" break; - case 282: -#line 740 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 833 "util/configparser.y" { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3183,11 +3338,11 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3187 "util/configparser.c" /* yacc.c:1646 */ +#line 3342 "util/configparser.c" break; - case 283: -#line 753 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 846 "util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3195,11 +3350,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3199 "util/configparser.c" /* yacc.c:1646 */ +#line 3354 "util/configparser.c" break; - case 284: -#line 762 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 855 "util/configparser.y" { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3207,11 +3362,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3211 "util/configparser.c" /* yacc.c:1646 */ +#line 3366 "util/configparser.c" break; - case 285: -#line 771 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 864 "util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3219,31 +3374,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3223 "util/configparser.c" /* yacc.c:1646 */ +#line 3378 "util/configparser.c" break; - case 286: -#line 780 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 873 "util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 3233 "util/configparser.c" /* yacc.c:1646 */ +#line 3388 "util/configparser.c" break; - case 287: -#line 787 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 880 "util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 3243 "util/configparser.c" /* yacc.c:1646 */ +#line 3398 "util/configparser.c" break; - case 288: -#line 794 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 887 "util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3251,21 +3406,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3255 "util/configparser.c" /* yacc.c:1646 */ +#line 3410 "util/configparser.c" break; - case 289: -#line 803 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 896 "util/configparser.y" { OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_cert_bundle); cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str); } -#line 3265 "util/configparser.c" /* yacc.c:1646 */ +#line 3420 "util/configparser.c" break; - case 290: -#line 810 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 903 "util/configparser.y" { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3273,53 +3428,53 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3277 "util/configparser.c" /* yacc.c:1646 */ +#line 3432 "util/configparser.c" break; - case 291: -#line 819 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 912 "util/configparser.y" { OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3288 "util/configparser.c" /* yacc.c:1646 */ +#line 3443 "util/configparser.c" break; - case 292: -#line 827 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 920 "util/configparser.y" { OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_ciphers); cfg_parser->cfg->tls_ciphers = (yyvsp[0].str); } -#line 3298 "util/configparser.c" /* yacc.c:1646 */ +#line 3453 "util/configparser.c" break; - case 293: -#line 834 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 927 "util/configparser.y" { OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_ciphersuites); cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str); } -#line 3308 "util/configparser.c" /* yacc.c:1646 */ +#line 3463 "util/configparser.c" break; - case 294: -#line 841 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 934 "util/configparser.y" { OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3319 "util/configparser.c" /* yacc.c:1646 */ +#line 3474 "util/configparser.c" break; - case 295: -#line 849 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 942 "util/configparser.y" { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3327,11 +3482,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3331 "util/configparser.c" /* yacc.c:1646 */ +#line 3486 "util/configparser.c" break; - case 296: -#line 858 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 951 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3339,11 +3494,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3343 "util/configparser.c" /* yacc.c:1646 */ +#line 3498 "util/configparser.c" break; - case 297: -#line 867 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 960 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3356,11 +3511,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3360 "util/configparser.c" /* yacc.c:1646 */ +#line 3515 "util/configparser.c" break; - case 298: -#line 881 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 974 "util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3368,11 +3523,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3372 "util/configparser.c" /* yacc.c:1646 */ +#line 3527 "util/configparser.c" break; - case 299: -#line 890 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 983 "util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3380,11 +3535,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3384 "util/configparser.c" /* yacc.c:1646 */ +#line 3539 "util/configparser.c" break; - case 300: -#line 899 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 992 "util/configparser.y" { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3392,11 +3547,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3396 "util/configparser.c" /* yacc.c:1646 */ +#line 3551 "util/configparser.c" break; - case 301: -#line 908 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1001 "util/configparser.y" { OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3404,11 +3559,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3408 "util/configparser.c" /* yacc.c:1646 */ +#line 3563 "util/configparser.c" break; - case 302: -#line 917 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1010 "util/configparser.y" { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3416,11 +3571,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3420 "util/configparser.c" /* yacc.c:1646 */ +#line 3575 "util/configparser.c" break; - case 303: -#line 926 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1019 "util/configparser.y" { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3428,31 +3583,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3432 "util/configparser.c" /* yacc.c:1646 */ +#line 3587 "util/configparser.c" break; - case 304: -#line 935 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1028 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3442 "util/configparser.c" /* yacc.c:1646 */ +#line 3597 "util/configparser.c" break; - case 305: -#line 942 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1035 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3452 "util/configparser.c" /* yacc.c:1646 */ +#line 3607 "util/configparser.c" break; - case 306: -#line 949 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1042 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3477,105 +3632,105 @@ yyreduce: } } } -#line 3481 "util/configparser.c" /* yacc.c:1646 */ +#line 3636 "util/configparser.c" break; - case 307: -#line 975 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1068 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 3492 "util/configparser.c" /* yacc.c:1646 */ +#line 3647 "util/configparser.c" break; - case 308: -#line 983 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1076 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3502 "util/configparser.c" /* yacc.c:1646 */ +#line 3657 "util/configparser.c" break; - case 309: -#line 990 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1083 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3512 "util/configparser.c" /* yacc.c:1646 */ +#line 3667 "util/configparser.c" break; - case 310: -#line 997 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1090 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3522 "util/configparser.c" /* yacc.c:1646 */ +#line 3677 "util/configparser.c" break; - case 311: -#line 1004 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1097 "util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3532 "util/configparser.c" /* yacc.c:1646 */ +#line 3687 "util/configparser.c" break; - case 312: -#line 1011 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1104 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3543 "util/configparser.c" /* yacc.c:1646 */ +#line 3698 "util/configparser.c" break; - case 313: -#line 1019 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1112 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3554 "util/configparser.c" /* yacc.c:1646 */ +#line 3709 "util/configparser.c" break; - case 314: -#line 1027 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1120 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3565 "util/configparser.c" /* yacc.c:1646 */ +#line 3720 "util/configparser.c" break; - case 315: -#line 1035 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1128 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3575 "util/configparser.c" /* yacc.c:1646 */ +#line 3730 "util/configparser.c" break; - case 316: -#line 1042 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1135 "util/configparser.y" { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3585,11 +3740,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3589 "util/configparser.c" /* yacc.c:1646 */ +#line 3744 "util/configparser.c" break; - case 317: -#line 1053 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1146 "util/configparser.y" { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3599,21 +3754,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3603 "util/configparser.c" /* yacc.c:1646 */ +#line 3758 "util/configparser.c" break; - case 318: -#line 1064 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1157 "util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3613 "util/configparser.c" /* yacc.c:1646 */ +#line 3768 "util/configparser.c" break; - case 319: -#line 1071 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1164 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3621,11 +3776,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3625 "util/configparser.c" /* yacc.c:1646 */ +#line 3780 "util/configparser.c" break; - case 320: -#line 1080 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1173 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3633,11 +3788,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3637 "util/configparser.c" /* yacc.c:1646 */ +#line 3792 "util/configparser.c" break; - case 321: -#line 1089 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1182 "util/configparser.y" { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3645,53 +3800,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3649 "util/configparser.c" /* yacc.c:1646 */ +#line 3804 "util/configparser.c" break; - case 322: -#line 1098 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1191 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3659 "util/configparser.c" /* yacc.c:1646 */ +#line 3814 "util/configparser.c" break; - case 323: -#line 1105 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1198 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3669 "util/configparser.c" /* yacc.c:1646 */ +#line 3824 "util/configparser.c" break; - case 324: -#line 1112 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1205 "util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3680 "util/configparser.c" /* yacc.c:1646 */ +#line 3835 "util/configparser.c" break; - case 325: -#line 1120 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1213 "util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3691 "util/configparser.c" /* yacc.c:1646 */ +#line 3846 "util/configparser.c" break; - case 326: -#line 1128 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1221 "util/configparser.y" { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3700,11 +3855,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3704 "util/configparser.c" /* yacc.c:1646 */ +#line 3859 "util/configparser.c" break; - case 327: -#line 1138 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1231 "util/configparser.y" { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3713,11 +3868,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3717 "util/configparser.c" /* yacc.c:1646 */ +#line 3872 "util/configparser.c" break; - case 328: -#line 1148 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1241 "util/configparser.y" { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3726,22 +3881,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3730 "util/configparser.c" /* yacc.c:1646 */ +#line 3885 "util/configparser.c" break; - case 329: -#line 1158 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1251 "util/configparser.y" { OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3741 "util/configparser.c" /* yacc.c:1646 */ +#line 3896 "util/configparser.c" break; - case 330: -#line 1166 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1259 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3753,11 +3908,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3757 "util/configparser.c" /* yacc.c:1646 */ +#line 3912 "util/configparser.c" break; - case 331: -#line 1179 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1272 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3767,22 +3922,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3771 "util/configparser.c" /* yacc.c:1646 */ +#line 3926 "util/configparser.c" break; - case 332: -#line 1190 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1283 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3782 "util/configparser.c" /* yacc.c:1646 */ +#line 3937 "util/configparser.c" break; - case 333: -#line 1198 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1291 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3794,11 +3949,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3798 "util/configparser.c" /* yacc.c:1646 */ +#line 3953 "util/configparser.c" break; - case 334: -#line 1211 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1304 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3806,11 +3961,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3810 "util/configparser.c" /* yacc.c:1646 */ +#line 3965 "util/configparser.c" break; - case 335: -#line 1220 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1313 "util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3818,11 +3973,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3822 "util/configparser.c" /* yacc.c:1646 */ +#line 3977 "util/configparser.c" break; - case 336: -#line 1229 "util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1322 "util/configparser.y" { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3830,11 +3985,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3834 "util/configparser.c" /* yacc.c:1646 */ +#line 3989 "util/configparser.c" break; - case 337: -#line 1238 "util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1331 "util/configparser.y" { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3843,11 +3998,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3847 "util/configparser.c" /* yacc.c:1646 */ +#line 4002 "util/configparser.c" break; - case 338: -#line 1248 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1341 "util/configparser.y" { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3856,22 +4011,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3860 "util/configparser.c" /* yacc.c:1646 */ +#line 4015 "util/configparser.c" break; - case 339: -#line 1258 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1351 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3871 "util/configparser.c" /* yacc.c:1646 */ +#line 4026 "util/configparser.c" break; - case 340: -#line 1266 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1359 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3883,11 +4038,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3887 "util/configparser.c" /* yacc.c:1646 */ +#line 4042 "util/configparser.c" break; - case 341: -#line 1279 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1372 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3895,22 +4050,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3899 "util/configparser.c" /* yacc.c:1646 */ +#line 4054 "util/configparser.c" break; - case 342: -#line 1288 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1381 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3910 "util/configparser.c" /* yacc.c:1646 */ +#line 4065 "util/configparser.c" break; - case 343: -#line 1296 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1389 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3918,22 +4073,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3922 "util/configparser.c" /* yacc.c:1646 */ +#line 4077 "util/configparser.c" break; - case 344: -#line 1305 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1398 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3933 "util/configparser.c" /* yacc.c:1646 */ +#line 4088 "util/configparser.c" break; - case 345: -#line 1313 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1406 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3945,11 +4100,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3949 "util/configparser.c" /* yacc.c:1646 */ +#line 4104 "util/configparser.c" break; - case 346: -#line 1326 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1419 "util/configparser.y" { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3957,21 +4112,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3961 "util/configparser.c" /* yacc.c:1646 */ +#line 4116 "util/configparser.c" break; - case 347: -#line 1335 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1428 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 3971 "util/configparser.c" /* yacc.c:1646 */ +#line 4126 "util/configparser.c" break; - case 348: -#line 1342 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1435 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3980,11 +4135,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3984 "util/configparser.c" /* yacc.c:1646 */ +#line 4139 "util/configparser.c" break; - case 349: -#line 1352 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1445 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3993,11 +4148,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3997 "util/configparser.c" /* yacc.c:1646 */ +#line 4152 "util/configparser.c" break; - case 350: -#line 1362 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1455 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4006,11 +4161,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4010 "util/configparser.c" /* yacc.c:1646 */ +#line 4165 "util/configparser.c" break; - case 351: -#line 1372 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1465 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4019,11 +4174,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4023 "util/configparser.c" /* yacc.c:1646 */ +#line 4178 "util/configparser.c" break; - case 352: -#line 1382 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1475 "util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4032,11 +4187,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4036 "util/configparser.c" /* yacc.c:1646 */ +#line 4191 "util/configparser.c" break; - case 353: -#line 1392 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1485 "util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4045,11 +4200,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4049 "util/configparser.c" /* yacc.c:1646 */ +#line 4204 "util/configparser.c" break; - case 354: -#line 1402 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1495 "util/configparser.y" { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4058,11 +4213,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4062 "util/configparser.c" /* yacc.c:1646 */ +#line 4217 "util/configparser.c" break; - case 355: -#line 1412 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1505 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4071,41 +4226,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4075 "util/configparser.c" /* yacc.c:1646 */ +#line 4230 "util/configparser.c" break; - case 356: -#line 1422 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1515 "util/configparser.y" { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4085 "util/configparser.c" /* yacc.c:1646 */ +#line 4240 "util/configparser.c" break; - case 357: -#line 1429 "util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1522 "util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4095 "util/configparser.c" /* yacc.c:1646 */ +#line 4250 "util/configparser.c" break; - case 358: -#line 1436 "util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1529 "util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4105 "util/configparser.c" /* yacc.c:1646 */ +#line 4260 "util/configparser.c" break; - case 359: -#line 1443 "util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1536 "util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4113,11 +4268,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4117 "util/configparser.c" /* yacc.c:1646 */ +#line 4272 "util/configparser.c" break; - case 360: -#line 1452 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1545 "util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4125,11 +4280,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4129 "util/configparser.c" /* yacc.c:1646 */ +#line 4284 "util/configparser.c" break; - case 361: -#line 1461 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1554 "util/configparser.y" { OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4137,11 +4292,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4141 "util/configparser.c" /* yacc.c:1646 */ +#line 4296 "util/configparser.c" break; - case 362: -#line 1470 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1563 "util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4149,21 +4304,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4153 "util/configparser.c" /* yacc.c:1646 */ +#line 4308 "util/configparser.c" break; - case 363: -#line 1479 "util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1572 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4163 "util/configparser.c" /* yacc.c:1646 */ +#line 4318 "util/configparser.c" break; - case 364: -#line 1486 "util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1579 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4172,11 +4327,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4176 "util/configparser.c" /* yacc.c:1646 */ +#line 4331 "util/configparser.c" break; - case 365: -#line 1496 "util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1589 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -4195,21 +4350,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 4199 "util/configparser.c" /* yacc.c:1646 */ +#line 4354 "util/configparser.c" break; - case 366: -#line 1516 "util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 1609 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 4209 "util/configparser.c" /* yacc.c:1646 */ +#line 4364 "util/configparser.c" break; - case 367: -#line 1523 "util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 1616 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4226,11 +4381,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4230 "util/configparser.c" /* yacc.c:1646 */ +#line 4385 "util/configparser.c" break; - case 368: -#line 1541 "util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 1634 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4242,11 +4397,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4246 "util/configparser.c" /* yacc.c:1646 */ +#line 4401 "util/configparser.c" break; - case 369: -#line 1554 "util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 1647 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4258,11 +4413,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4262 "util/configparser.c" /* yacc.c:1646 */ +#line 4417 "util/configparser.c" break; - case 370: -#line 1567 "util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 1660 "util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4270,11 +4425,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4274 "util/configparser.c" /* yacc.c:1646 */ +#line 4429 "util/configparser.c" break; - case 371: -#line 1576 "util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 1669 "util/configparser.y" { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4282,11 +4437,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4286 "util/configparser.c" /* yacc.c:1646 */ +#line 4441 "util/configparser.c" break; - case 372: -#line 1585 "util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 1678 "util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4294,11 +4449,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4298 "util/configparser.c" /* yacc.c:1646 */ +#line 4453 "util/configparser.c" break; - case 373: -#line 1594 "util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 1687 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4306,11 +4461,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4310 "util/configparser.c" /* yacc.c:1646 */ +#line 4465 "util/configparser.c" break; - case 374: -#line 1603 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 1696 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4319,11 +4474,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4323 "util/configparser.c" /* yacc.c:1646 */ +#line 4478 "util/configparser.c" break; - case 375: -#line 1613 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 1706 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4332,11 +4487,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4336 "util/configparser.c" /* yacc.c:1646 */ +#line 4491 "util/configparser.c" break; - case 376: -#line 1623 "util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 1716 "util/configparser.y" { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4346,11 +4501,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4350 "util/configparser.c" /* yacc.c:1646 */ +#line 4505 "util/configparser.c" break; - case 377: -#line 1634 "util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 1727 "util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4358,11 +4513,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4362 "util/configparser.c" /* yacc.c:1646 */ +#line 4517 "util/configparser.c" break; - case 378: -#line 1643 "util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 1736 "util/configparser.y" { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4370,11 +4525,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4374 "util/configparser.c" /* yacc.c:1646 */ +#line 4529 "util/configparser.c" break; - case 379: -#line 1652 "util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 1745 "util/configparser.y" { OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4382,11 +4537,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4386 "util/configparser.c" /* yacc.c:1646 */ +#line 4541 "util/configparser.c" break; - case 380: -#line 1661 "util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 1754 "util/configparser.y" { OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4394,43 +4549,67 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4398 "util/configparser.c" /* yacc.c:1646 */ +#line 4553 "util/configparser.c" break; - case 381: -#line 1670 "util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 1763 "util/configparser.y" + { + OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 4565 "util/configparser.c" + break; + + case 403: +#line 1772 "util/configparser.y" + { + OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 4577 "util/configparser.c" + break; + + case 404: +#line 1781 "util/configparser.y" { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); -#ifdef HAVE_SSL +#if defined(HAVE_SSL) || defined(HAVE_NETTLE) else fake_dsa = (strcmp((yyvsp[0].str), "yes")==0); if(fake_dsa) log_warn("test option fake_dsa is enabled"); #endif free((yyvsp[0].str)); } -#line 4414 "util/configparser.c" /* yacc.c:1646 */ +#line 4593 "util/configparser.c" break; - case 382: -#line 1683 "util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 1794 "util/configparser.y" { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); -#ifdef HAVE_SSL +#if defined(HAVE_SSL) || defined(HAVE_NETTLE) else fake_sha1 = (strcmp((yyvsp[0].str), "yes")==0); if(fake_sha1) log_warn("test option fake_sha1 is enabled"); #endif free((yyvsp[0].str)); } -#line 4430 "util/configparser.c" /* yacc.c:1646 */ +#line 4609 "util/configparser.c" break; - case 383: -#line 1696 "util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 1807 "util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4438,21 +4617,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4442 "util/configparser.c" /* yacc.c:1646 */ +#line 4621 "util/configparser.c" break; - case 384: -#line 1705 "util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 1816 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 4452 "util/configparser.c" /* yacc.c:1646 */ +#line 4631 "util/configparser.c" break; - case 385: -#line 1712 "util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 1823 "util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4460,11 +4639,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4464 "util/configparser.c" /* yacc.c:1646 */ +#line 4643 "util/configparser.c" break; - case 386: -#line 1721 "util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 1832 "util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4472,11 +4651,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4476 "util/configparser.c" /* yacc.c:1646 */ +#line 4655 "util/configparser.c" break; - case 387: -#line 1730 "util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 1841 "util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4484,11 +4663,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4488 "util/configparser.c" /* yacc.c:1646 */ +#line 4667 "util/configparser.c" break; - case 388: -#line 1739 "util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 1850 "util/configparser.y" { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4497,22 +4676,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4501 "util/configparser.c" /* yacc.c:1646 */ +#line 4680 "util/configparser.c" break; - case 389: -#line 1748 "util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 1859 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4512 "util/configparser.c" /* yacc.c:1646 */ +#line 4691 "util/configparser.c" break; - case 390: -#line 1756 "util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 1867 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4524,22 +4703,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4528 "util/configparser.c" /* yacc.c:1646 */ +#line 4707 "util/configparser.c" break; - case 391: -#line 1769 "util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 1880 "util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4539 "util/configparser.c" /* yacc.c:1646 */ +#line 4718 "util/configparser.c" break; - case 392: -#line 1777 "util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 1888 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -4579,21 +4758,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4583 "util/configparser.c" /* yacc.c:1646 */ +#line 4762 "util/configparser.c" break; - case 393: -#line 1818 "util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 1929 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 4593 "util/configparser.c" /* yacc.c:1646 */ +#line 4772 "util/configparser.c" break; - case 394: -#line 1825 "util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 1936 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4607,11 +4786,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4611 "util/configparser.c" /* yacc.c:1646 */ +#line 4790 "util/configparser.c" break; - case 395: -#line 1840 "util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 1951 "util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4620,11 +4799,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4624 "util/configparser.c" /* yacc.c:1646 */ +#line 4803 "util/configparser.c" break; - case 396: -#line 1850 "util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 1961 "util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4633,41 +4812,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4637 "util/configparser.c" /* yacc.c:1646 */ +#line 4816 "util/configparser.c" break; - case 397: -#line 1860 "util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 1971 "util/configparser.y" { OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4647 "util/configparser.c" /* yacc.c:1646 */ +#line 4826 "util/configparser.c" break; - case 398: -#line 1867 "util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 1978 "util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4657 "util/configparser.c" /* yacc.c:1646 */ +#line 4836 "util/configparser.c" break; - case 399: -#line 1874 "util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 1985 "util/configparser.y" { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4667 "util/configparser.c" /* yacc.c:1646 */ +#line 4846 "util/configparser.c" break; - case 400: -#line 1881 "util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 1992 "util/configparser.y" { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4675,22 +4854,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4679 "util/configparser.c" /* yacc.c:1646 */ +#line 4858 "util/configparser.c" break; - case 401: -#line 1890 "util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2001 "util/configparser.y" { OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa, (yyvsp[0].str))) fatal_exit("out of memory adding dns64-ignore-aaaa"); } -#line 4690 "util/configparser.c" /* yacc.c:1646 */ +#line 4869 "util/configparser.c" break; - case 402: -#line 1898 "util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2009 "util/configparser.y" { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4703,11 +4882,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4707 "util/configparser.c" /* yacc.c:1646 */ +#line 4886 "util/configparser.c" break; - case 403: -#line 1912 "util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2023 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4727,11 +4906,11 @@ yyreduce: } } } -#line 4731 "util/configparser.c" /* yacc.c:1646 */ +#line 4910 "util/configparser.c" break; - case 404: -#line 1933 "util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2044 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4751,11 +4930,11 @@ yyreduce: } } } -#line 4755 "util/configparser.c" /* yacc.c:1646 */ +#line 4934 "util/configparser.c" break; - case 405: -#line 1954 "util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2065 "util/configparser.y" { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -4766,11 +4945,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4770 "util/configparser.c" /* yacc.c:1646 */ +#line 4949 "util/configparser.c" break; - case 406: -#line 1966 "util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2077 "util/configparser.y" { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -4781,11 +4960,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4785 "util/configparser.c" /* yacc.c:1646 */ +#line 4964 "util/configparser.c" break; - case 407: -#line 1978 "util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2089 "util/configparser.y" { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -4796,11 +4975,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4800 "util/configparser.c" /* yacc.c:1646 */ +#line 4979 "util/configparser.c" break; - case 408: -#line 1990 "util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2101 "util/configparser.y" { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4808,11 +4987,11 @@ yyreduce: yyerror("out of memory"); } } -#line 4812 "util/configparser.c" /* yacc.c:1646 */ +#line 4991 "util/configparser.c" break; - case 409: -#line 1999 "util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2110 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4832,11 +5011,11 @@ yyreduce: } } } -#line 4836 "util/configparser.c" /* yacc.c:1646 */ +#line 5015 "util/configparser.c" break; - case 410: -#line 2020 "util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2131 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4844,11 +5023,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4848 "util/configparser.c" /* yacc.c:1646 */ +#line 5027 "util/configparser.c" break; - case 411: -#line 2030 "util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2141 "util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4856,33 +5035,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4860 "util/configparser.c" /* yacc.c:1646 */ +#line 5039 "util/configparser.c" break; - case 412: -#line 2039 "util/configparser.y" /* yacc.c:1646 */ + case 435: +#line 2150 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4871 "util/configparser.c" /* yacc.c:1646 */ +#line 5050 "util/configparser.c" break; - case 413: -#line 2047 "util/configparser.y" /* yacc.c:1646 */ + case 436: +#line 2158 "util/configparser.y" { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4882 "util/configparser.c" /* yacc.c:1646 */ +#line 5061 "util/configparser.c" break; - case 414: -#line 2055 "util/configparser.y" /* yacc.c:1646 */ + case 437: +#line 2166 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4894,11 +5073,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4898 "util/configparser.c" /* yacc.c:1646 */ +#line 5077 "util/configparser.c" break; - case 415: -#line 2068 "util/configparser.y" /* yacc.c:1646 */ + case 438: +#line 2179 "util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4910,11 +5089,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4914 "util/configparser.c" /* yacc.c:1646 */ +#line 5093 "util/configparser.c" break; - case 416: -#line 2081 "util/configparser.y" /* yacc.c:1646 */ + case 439: +#line 2192 "util/configparser.y" { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4928,11 +5107,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4932 "util/configparser.c" /* yacc.c:1646 */ +#line 5111 "util/configparser.c" break; - case 417: -#line 2096 "util/configparser.y" /* yacc.c:1646 */ + case 440: +#line 2207 "util/configparser.y" { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4946,11 +5125,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4950 "util/configparser.c" /* yacc.c:1646 */ +#line 5129 "util/configparser.c" break; - case 418: -#line 2111 "util/configparser.y" /* yacc.c:1646 */ + case 441: +#line 2222 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4958,11 +5137,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4962 "util/configparser.c" /* yacc.c:1646 */ +#line 5141 "util/configparser.c" break; - case 419: -#line 2120 "util/configparser.y" /* yacc.c:1646 */ + case 442: +#line 2231 "util/configparser.y" { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4970,20 +5149,20 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4974 "util/configparser.c" /* yacc.c:1646 */ +#line 5153 "util/configparser.c" break; - case 420: -#line 2129 "util/configparser.y" /* yacc.c:1646 */ + case 443: +#line 2240 "util/configparser.y" { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 4983 "util/configparser.c" /* yacc.c:1646 */ +#line 5162 "util/configparser.c" break; - case 421: -#line 2135 "util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2246 "util/configparser.y" { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -4991,11 +5170,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4995 "util/configparser.c" /* yacc.c:1646 */ +#line 5174 "util/configparser.c" break; - case 422: -#line 2144 "util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2255 "util/configparser.y" { OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5003,11 +5182,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5007 "util/configparser.c" /* yacc.c:1646 */ +#line 5186 "util/configparser.c" break; - case 423: -#line 2153 "util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2264 "util/configparser.y" { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5016,11 +5195,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5020 "util/configparser.c" /* yacc.c:1646 */ +#line 5199 "util/configparser.c" break; - case 424: -#line 2163 "util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2274 "util/configparser.y" { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5029,11 +5208,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5033 "util/configparser.c" /* yacc.c:1646 */ +#line 5212 "util/configparser.c" break; - case 425: -#line 2173 "util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2284 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -5045,11 +5224,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5049 "util/configparser.c" /* yacc.c:1646 */ +#line 5228 "util/configparser.c" break; - case 426: -#line 2186 "util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2297 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -5061,11 +5240,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5065 "util/configparser.c" /* yacc.c:1646 */ +#line 5244 "util/configparser.c" break; - case 427: -#line 2199 "util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2310 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -5076,11 +5255,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5080 "util/configparser.c" /* yacc.c:1646 */ +#line 5259 "util/configparser.c" break; - case 428: -#line 2211 "util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2322 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5093,11 +5272,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5097 "util/configparser.c" /* yacc.c:1646 */ +#line 5276 "util/configparser.c" break; - case 429: -#line 2225 "util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2336 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5108,11 +5287,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5112 "util/configparser.c" /* yacc.c:1646 */ +#line 5291 "util/configparser.c" break; - case 430: -#line 2237 "util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2348 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5125,11 +5304,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5129 "util/configparser.c" /* yacc.c:1646 */ +#line 5308 "util/configparser.c" break; - case 431: -#line 2251 "util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2362 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5138,31 +5317,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5142 "util/configparser.c" /* yacc.c:1646 */ +#line 5321 "util/configparser.c" break; - case 432: -#line 2261 "util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2372 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5152 "util/configparser.c" /* yacc.c:1646 */ +#line 5331 "util/configparser.c" break; - case 433: -#line 2268 "util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2379 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5162 "util/configparser.c" /* yacc.c:1646 */ +#line 5341 "util/configparser.c" break; - case 434: -#line 2275 "util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2386 "util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5170,11 +5349,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5174 "util/configparser.c" /* yacc.c:1646 */ +#line 5353 "util/configparser.c" break; - case 435: -#line 2284 "util/configparser.y" /* yacc.c:1646 */ + case 458: +#line 2395 "util/configparser.y" { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5182,11 +5361,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5186 "util/configparser.c" /* yacc.c:1646 */ +#line 5365 "util/configparser.c" break; - case 436: -#line 2293 "util/configparser.y" /* yacc.c:1646 */ + case 459: +#line 2404 "util/configparser.y" { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5195,11 +5374,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5199 "util/configparser.c" /* yacc.c:1646 */ +#line 5378 "util/configparser.c" break; - case 437: -#line 2303 "util/configparser.y" /* yacc.c:1646 */ + case 460: +#line 2414 "util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5208,11 +5387,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5212 "util/configparser.c" /* yacc.c:1646 */ +#line 5391 "util/configparser.c" break; - case 438: -#line 2313 "util/configparser.y" /* yacc.c:1646 */ + case 461: +#line 2424 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5221,31 +5400,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5225 "util/configparser.c" /* yacc.c:1646 */ +#line 5404 "util/configparser.c" break; - case 439: -#line 2323 "util/configparser.y" /* yacc.c:1646 */ + case 462: +#line 2434 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5235 "util/configparser.c" /* yacc.c:1646 */ +#line 5414 "util/configparser.c" break; - case 440: -#line 2330 "util/configparser.y" /* yacc.c:1646 */ + case 463: +#line 2441 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5245 "util/configparser.c" /* yacc.c:1646 */ +#line 5424 "util/configparser.c" break; - case 441: -#line 2337 "util/configparser.y" /* yacc.c:1646 */ + case 464: +#line 2448 "util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5253,11 +5432,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5257 "util/configparser.c" /* yacc.c:1646 */ +#line 5436 "util/configparser.c" break; - case 442: -#line 2346 "util/configparser.y" /* yacc.c:1646 */ + case 465: +#line 2457 "util/configparser.y" { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5265,11 +5444,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5269 "util/configparser.c" /* yacc.c:1646 */ +#line 5448 "util/configparser.c" break; - case 443: -#line 2355 "util/configparser.y" /* yacc.c:1646 */ + case 466: +#line 2466 "util/configparser.y" { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5278,11 +5457,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5282 "util/configparser.c" /* yacc.c:1646 */ +#line 5461 "util/configparser.c" break; - case 444: -#line 2365 "util/configparser.y" /* yacc.c:1646 */ + case 467: +#line 2476 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5291,52 +5470,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5295 "util/configparser.c" /* yacc.c:1646 */ +#line 5474 "util/configparser.c" break; - case 445: -#line 2375 "util/configparser.y" /* yacc.c:1646 */ + case 468: +#line 2486 "util/configparser.y" { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 5305 "util/configparser.c" /* yacc.c:1646 */ +#line 5484 "util/configparser.c" break; - case 446: -#line 2382 "util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2493 "util/configparser.y" { OUTYY(("P(master:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5315 "util/configparser.c" /* yacc.c:1646 */ +#line 5494 "util/configparser.c" break; - case 447: -#line 2389 "util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2500 "util/configparser.y" { OUTYY(("P(url:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5325 "util/configparser.c" /* yacc.c:1646 */ +#line 5504 "util/configparser.c" break; - case 448: -#line 2396 "util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2507 "util/configparser.y" { OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5336 "util/configparser.c" /* yacc.c:1646 */ +#line 5515 "util/configparser.c" break; - case 449: -#line 2404 "util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2515 "util/configparser.y" { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5345,11 +5524,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5349 "util/configparser.c" /* yacc.c:1646 */ +#line 5528 "util/configparser.c" break; - case 450: -#line 2414 "util/configparser.y" /* yacc.c:1646 */ + case 473: +#line 2525 "util/configparser.y" { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5358,11 +5537,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5362 "util/configparser.c" /* yacc.c:1646 */ +#line 5541 "util/configparser.c" break; - case 451: -#line 2424 "util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2535 "util/configparser.y" { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5371,11 +5550,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5375 "util/configparser.c" /* yacc.c:1646 */ +#line 5554 "util/configparser.c" break; - case 452: -#line 2434 "util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2545 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5384,11 +5563,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5388 "util/configparser.c" /* yacc.c:1646 */ +#line 5567 "util/configparser.c" break; - case 453: -#line 2444 "util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2555 "util/configparser.y" { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -5426,11 +5605,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5430 "util/configparser.c" /* yacc.c:1646 */ +#line 5609 "util/configparser.c" break; - case 454: -#line 2483 "util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2594 "util/configparser.y" { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5439,33 +5618,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5443 "util/configparser.c" /* yacc.c:1646 */ +#line 5622 "util/configparser.c" break; - case 455: -#line 2493 "util/configparser.y" /* yacc.c:1646 */ + case 478: +#line 2604 "util/configparser.y" { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5454 "util/configparser.c" /* yacc.c:1646 */ +#line 5633 "util/configparser.c" break; - case 456: -#line 2501 "util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2612 "util/configparser.y" { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { fatal_exit("out of memory adding local-data"); } } -#line 5465 "util/configparser.c" /* yacc.c:1646 */ +#line 5644 "util/configparser.c" break; - case 457: -#line 2509 "util/configparser.y" /* yacc.c:1646 */ + case 480: +#line 2620 "util/configparser.y" { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5479,11 +5658,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5483 "util/configparser.c" /* yacc.c:1646 */ +#line 5662 "util/configparser.c" break; - case 458: -#line 2524 "util/configparser.y" /* yacc.c:1646 */ + case 481: +#line 2635 "util/configparser.y" { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5491,19 +5670,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5495 "util/configparser.c" /* yacc.c:1646 */ +#line 5674 "util/configparser.c" break; - case 459: -#line 2533 "util/configparser.y" /* yacc.c:1646 */ + case 482: +#line 2644 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } -#line 5503 "util/configparser.c" /* yacc.c:1646 */ +#line 5682 "util/configparser.c" break; - case 470: -#line 2544 "util/configparser.y" /* yacc.c:1646 */ + case 493: +#line 2655 "util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5512,11 +5691,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5516 "util/configparser.c" /* yacc.c:1646 */ +#line 5695 "util/configparser.c" break; - case 471: -#line 2554 "util/configparser.y" /* yacc.c:1646 */ + case 494: +#line 2665 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5524,79 +5703,79 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5528 "util/configparser.c" /* yacc.c:1646 */ +#line 5707 "util/configparser.c" break; - case 472: -#line 2563 "util/configparser.y" /* yacc.c:1646 */ + case 495: +#line 2674 "util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5538 "util/configparser.c" /* yacc.c:1646 */ +#line 5717 "util/configparser.c" break; - case 473: -#line 2570 "util/configparser.y" /* yacc.c:1646 */ + case 496: +#line 2681 "util/configparser.y" { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5548 "util/configparser.c" /* yacc.c:1646 */ +#line 5727 "util/configparser.c" break; - case 474: -#line 2577 "util/configparser.y" /* yacc.c:1646 */ + case 497: +#line 2688 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 5558 "util/configparser.c" /* yacc.c:1646 */ +#line 5737 "util/configparser.c" break; - case 475: -#line 2584 "util/configparser.y" /* yacc.c:1646 */ + case 498: +#line 2695 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 5568 "util/configparser.c" /* yacc.c:1646 */ +#line 5747 "util/configparser.c" break; - case 476: -#line 2591 "util/configparser.y" /* yacc.c:1646 */ + case 499: +#line 2702 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 5578 "util/configparser.c" /* yacc.c:1646 */ +#line 5757 "util/configparser.c" break; - case 477: -#line 2598 "util/configparser.y" /* yacc.c:1646 */ + case 500: +#line 2709 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 5588 "util/configparser.c" /* yacc.c:1646 */ +#line 5767 "util/configparser.c" break; - case 478: -#line 2605 "util/configparser.y" /* yacc.c:1646 */ + case 501: +#line 2716 "util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } -#line 5596 "util/configparser.c" /* yacc.c:1646 */ +#line 5775 "util/configparser.c" break; - case 493: -#line 2622 "util/configparser.y" /* yacc.c:1646 */ + case 516: +#line 2733 "util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5604,21 +5783,21 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5608 "util/configparser.c" /* yacc.c:1646 */ +#line 5787 "util/configparser.c" break; - case 494: -#line 2631 "util/configparser.y" /* yacc.c:1646 */ + case 517: +#line 2742 "util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 5618 "util/configparser.c" /* yacc.c:1646 */ +#line 5797 "util/configparser.c" break; - case 495: -#line 2638 "util/configparser.y" /* yacc.c:1646 */ + case 518: +#line 2749 "util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5626,11 +5805,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5630 "util/configparser.c" /* yacc.c:1646 */ +#line 5809 "util/configparser.c" break; - case 496: -#line 2647 "util/configparser.y" /* yacc.c:1646 */ + case 519: +#line 2758 "util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5638,31 +5817,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5642 "util/configparser.c" /* yacc.c:1646 */ +#line 5821 "util/configparser.c" break; - case 497: -#line 2656 "util/configparser.y" /* yacc.c:1646 */ + case 520: +#line 2767 "util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 5652 "util/configparser.c" /* yacc.c:1646 */ +#line 5831 "util/configparser.c" break; - case 498: -#line 2663 "util/configparser.y" /* yacc.c:1646 */ + case 521: +#line 2774 "util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 5662 "util/configparser.c" /* yacc.c:1646 */ +#line 5841 "util/configparser.c" break; - case 499: -#line 2670 "util/configparser.y" /* yacc.c:1646 */ + case 522: +#line 2781 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5671,11 +5850,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5675 "util/configparser.c" /* yacc.c:1646 */ +#line 5854 "util/configparser.c" break; - case 500: -#line 2680 "util/configparser.y" /* yacc.c:1646 */ + case 523: +#line 2791 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5684,11 +5863,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5688 "util/configparser.c" /* yacc.c:1646 */ +#line 5867 "util/configparser.c" break; - case 501: -#line 2690 "util/configparser.y" /* yacc.c:1646 */ + case 524: +#line 2801 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5697,11 +5876,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5701 "util/configparser.c" /* yacc.c:1646 */ +#line 5880 "util/configparser.c" break; - case 502: -#line 2700 "util/configparser.y" /* yacc.c:1646 */ + case 525: +#line 2811 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5710,11 +5889,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5714 "util/configparser.c" /* yacc.c:1646 */ +#line 5893 "util/configparser.c" break; - case 503: -#line 2710 "util/configparser.y" /* yacc.c:1646 */ + case 526: +#line 2821 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5723,11 +5902,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5727 "util/configparser.c" /* yacc.c:1646 */ +#line 5906 "util/configparser.c" break; - case 504: -#line 2720 "util/configparser.y" /* yacc.c:1646 */ + case 527: +#line 2831 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5736,29 +5915,29 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5740 "util/configparser.c" /* yacc.c:1646 */ +#line 5919 "util/configparser.c" break; - case 505: -#line 2730 "util/configparser.y" /* yacc.c:1646 */ + case 528: +#line 2841 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } -#line 5748 "util/configparser.c" /* yacc.c:1646 */ +#line 5927 "util/configparser.c" break; - case 509: -#line 2739 "util/configparser.y" /* yacc.c:1646 */ + case 532: +#line 2850 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5758 "util/configparser.c" /* yacc.c:1646 */ +#line 5937 "util/configparser.c" break; - case 510: -#line 2745 "util/configparser.y" /* yacc.c:1646 */ + case 533: +#line 2856 "util/configparser.y" { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5767,21 +5946,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5771 "util/configparser.c" /* yacc.c:1646 */ +#line 5950 "util/configparser.c" break; - case 511: -#line 2755 "util/configparser.y" /* yacc.c:1646 */ + case 534: +#line 2866 "util/configparser.y" { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 5781 "util/configparser.c" /* yacc.c:1646 */ +#line 5960 "util/configparser.c" break; - case 512: -#line 2762 "util/configparser.y" /* yacc.c:1646 */ + case 535: +#line 2873 "util/configparser.y" { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5789,30 +5968,30 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5793 "util/configparser.c" /* yacc.c:1646 */ +#line 5972 "util/configparser.c" break; - case 513: -#line 2771 "util/configparser.y" /* yacc.c:1646 */ + case 536: +#line 2882 "util/configparser.y" { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 5804 "util/configparser.c" /* yacc.c:1646 */ +#line 5983 "util/configparser.c" break; - case 514: -#line 2779 "util/configparser.y" /* yacc.c:1646 */ + case 537: +#line 2890 "util/configparser.y" { OUTYY(("\nP(dnscrypt:)\n")); } -#line 5812 "util/configparser.c" /* yacc.c:1646 */ +#line 5991 "util/configparser.c" break; - case 527: -#line 2795 "util/configparser.y" /* yacc.c:1646 */ + case 550: +#line 2906 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5820,11 +5999,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5824 "util/configparser.c" /* yacc.c:1646 */ +#line 6003 "util/configparser.c" break; - case 528: -#line 2805 "util/configparser.y" /* yacc.c:1646 */ + case 551: +#line 2916 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5832,21 +6011,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5836 "util/configparser.c" /* yacc.c:1646 */ +#line 6015 "util/configparser.c" break; - case 529: -#line 2814 "util/configparser.y" /* yacc.c:1646 */ + case 552: +#line 2925 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5846 "util/configparser.c" /* yacc.c:1646 */ +#line 6025 "util/configparser.c" break; - case 530: -#line 2821 "util/configparser.y" /* yacc.c:1646 */ + case 553: +#line 2932 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -5854,21 +6033,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5858 "util/configparser.c" /* yacc.c:1646 */ +#line 6037 "util/configparser.c" break; - case 531: -#line 2830 "util/configparser.y" /* yacc.c:1646 */ + case 554: +#line 2941 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); } -#line 5868 "util/configparser.c" /* yacc.c:1646 */ +#line 6047 "util/configparser.c" break; - case 532: -#line 2837 "util/configparser.y" /* yacc.c:1646 */ + case 555: +#line 2948 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -5876,22 +6055,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5880 "util/configparser.c" /* yacc.c:1646 */ +#line 6059 "util/configparser.c" break; - case 533: -#line 2846 "util/configparser.y" /* yacc.c:1646 */ + case 556: +#line 2957 "util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5891 "util/configparser.c" /* yacc.c:1646 */ +#line 6070 "util/configparser.c" break; - case 534: -#line 2854 "util/configparser.y" /* yacc.c:1646 */ + case 557: +#line 2965 "util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5903,22 +6082,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5907 "util/configparser.c" /* yacc.c:1646 */ +#line 6086 "util/configparser.c" break; - case 535: -#line 2867 "util/configparser.y" /* yacc.c:1646 */ + case 558: +#line 2978 "util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5918 "util/configparser.c" /* yacc.c:1646 */ +#line 6097 "util/configparser.c" break; - case 536: -#line 2875 "util/configparser.y" /* yacc.c:1646 */ + case 559: +#line 2986 "util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5930,25 +6109,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5934 "util/configparser.c" /* yacc.c:1646 */ +#line 6113 "util/configparser.c" break; - case 537: -#line 2888 "util/configparser.y" /* yacc.c:1646 */ + case 560: +#line 2999 "util/configparser.y" { OUTYY(("\nP(cachedb:)\n")); } -#line 5942 "util/configparser.c" /* yacc.c:1646 */ +#line 6121 "util/configparser.c" break; - case 545: -#line 2898 "util/configparser.y" /* yacc.c:1646 */ + case 568: +#line 3009 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); - if(cfg_parser->cfg->cachedb_backend) - yyerror("cachedb backend override, there must be one " - "backend"); free(cfg_parser->cfg->cachedb_backend); cfg_parser->cfg->cachedb_backend = (yyvsp[0].str); #else @@ -5956,17 +6132,14 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5960 "util/configparser.c" /* yacc.c:1646 */ +#line 6136 "util/configparser.c" break; - case 546: -#line 2913 "util/configparser.y" /* yacc.c:1646 */ + case 569: +#line 3021 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); - if(cfg_parser->cfg->cachedb_secret) - yyerror("cachedb secret-seed override, there must be " - "only one secret"); free(cfg_parser->cfg->cachedb_secret); cfg_parser->cfg->cachedb_secret = (yyvsp[0].str); #else @@ -5974,11 +6147,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5978 "util/configparser.c" /* yacc.c:1646 */ +#line 6151 "util/configparser.c" break; - case 547: -#line 2928 "util/configparser.y" /* yacc.c:1646 */ + case 570: +#line 3033 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -5989,11 +6162,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5993 "util/configparser.c" /* yacc.c:1646 */ +#line 6166 "util/configparser.c" break; - case 548: -#line 2940 "util/configparser.y" /* yacc.c:1646 */ + case 571: +#line 3045 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -6007,11 +6180,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6011 "util/configparser.c" /* yacc.c:1646 */ +#line 6184 "util/configparser.c" break; - case 549: -#line 2955 "util/configparser.y" /* yacc.c:1646 */ + case 572: +#line 3060 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -6023,11 +6196,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6027 "util/configparser.c" /* yacc.c:1646 */ +#line 6200 "util/configparser.c" break; - case 550: -#line 2968 "util/configparser.y" /* yacc.c:1646 */ + case 573: +#line 3073 "util/configparser.y" { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -6037,19 +6210,19 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 6041 "util/configparser.c" /* yacc.c:1646 */ +#line 6214 "util/configparser.c" break; - case 551: -#line 2979 "util/configparser.y" /* yacc.c:1646 */ + case 574: +#line 3084 "util/configparser.y" { OUTYY(("\nP(ipset:)\n")); } -#line 6049 "util/configparser.c" /* yacc.c:1646 */ +#line 6222 "util/configparser.c" break; - case 556: -#line 2988 "util/configparser.y" /* yacc.c:1646 */ + case 579: +#line 3093 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -6063,11 +6236,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6067 "util/configparser.c" /* yacc.c:1646 */ +#line 6240 "util/configparser.c" break; - case 557: -#line 3003 "util/configparser.y" /* yacc.c:1646 */ + case 580: +#line 3108 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -6081,11 +6254,12 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6085 "util/configparser.c" /* yacc.c:1646 */ +#line 6258 "util/configparser.c" break; -#line 6089 "util/configparser.c" /* yacc.c:1646 */ +#line 6262 "util/configparser.c" + default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -6110,14 +6284,13 @@ yyreduce: /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; @@ -6200,12 +6373,10 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -6267,6 +6438,7 @@ yyacceptlab: yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -6274,6 +6446,7 @@ yyabortlab: yyresult = 1; goto yyreturn; + #if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | @@ -6284,6 +6457,10 @@ yyexhaustedlab: /* Fall through. */ #endif + +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -6313,7 +6490,7 @@ yyreturn: #endif return yyresult; } -#line 3017 "util/configparser.y" /* yacc.c:1906 */ +#line 3122 "util/configparser.y" /* parse helper routines could be here */ |