diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 2235 |
1 files changed, 1166 insertions, 1069 deletions
diff --git a/util/configparser.c b/util/configparser.c index 9fa436b02886..7829ed8cd2bf 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -333,12 +333,17 @@ extern int yydebug; VAR_DNSCRYPT_PROVIDER = 462, VAR_DNSCRYPT_SECRET_KEY = 463, VAR_DNSCRYPT_PROVIDER_CERT = 464, - VAR_IPSECMOD_ENABLED = 465, - VAR_IPSECMOD_HOOK = 466, - VAR_IPSECMOD_IGNORE_BOGUS = 467, - VAR_IPSECMOD_MAX_TTL = 468, - VAR_IPSECMOD_WHITELIST = 469, - VAR_IPSECMOD_STRICT = 470 + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 465, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 466, + VAR_IPSECMOD_ENABLED = 467, + VAR_IPSECMOD_HOOK = 468, + VAR_IPSECMOD_IGNORE_BOGUS = 469, + VAR_IPSECMOD_MAX_TTL = 470, + VAR_IPSECMOD_WHITELIST = 471, + VAR_IPSECMOD_STRICT = 472, + VAR_CACHEDB = 473, + VAR_CACHEDB_BACKEND = 474, + VAR_CACHEDB_SECRETSEED = 475 }; #endif /* Tokens. */ @@ -549,12 +554,17 @@ extern int yydebug; #define VAR_DNSCRYPT_PROVIDER 462 #define VAR_DNSCRYPT_SECRET_KEY 463 #define VAR_DNSCRYPT_PROVIDER_CERT 464 -#define VAR_IPSECMOD_ENABLED 465 -#define VAR_IPSECMOD_HOOK 466 -#define VAR_IPSECMOD_IGNORE_BOGUS 467 -#define VAR_IPSECMOD_MAX_TTL 468 -#define VAR_IPSECMOD_WHITELIST 469 -#define VAR_IPSECMOD_STRICT 470 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 465 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 466 +#define VAR_IPSECMOD_ENABLED 467 +#define VAR_IPSECMOD_HOOK 468 +#define VAR_IPSECMOD_IGNORE_BOGUS 469 +#define VAR_IPSECMOD_MAX_TTL 470 +#define VAR_IPSECMOD_WHITELIST 471 +#define VAR_IPSECMOD_STRICT 472 +#define VAR_CACHEDB 473 +#define VAR_CACHEDB_BACKEND 474 +#define VAR_CACHEDB_SECRETSEED 475 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -565,7 +575,7 @@ union YYSTYPE char* str; -#line 569 "util/configparser.c" /* yacc.c:355 */ +#line 579 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -582,7 +592,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 586 "util/configparser.c" /* yacc.c:358 */ +#line 596 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -824,21 +834,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 442 +#define YYLAST 446 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 216 +#define YYNTOKENS 221 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 231 +#define YYNNTS 238 /* YYNRULES -- Number of rules. */ -#define YYNRULES 443 +#define YYNRULES 455 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 667 +#define YYNSTATES 683 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 470 +#define YYMAXUTOK 475 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -894,58 +904,59 @@ static const yytype_uint8 yytranslate[] = 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215 + 215, 216, 217, 218, 219, 220 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 151, 151, 151, 152, 152, 153, 153, 154, 154, - 154, 156, 160, 165, 166, 167, 167, 167, 168, 168, - 169, 169, 170, 170, 171, 171, 172, 172, 172, 173, - 173, 173, 174, 174, 175, 175, 176, 176, 177, 177, - 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, - 182, 183, 183, 183, 184, 184, 184, 185, 185, 186, - 186, 187, 187, 188, 188, 189, 189, 189, 190, 190, - 191, 191, 192, 192, 192, 193, 193, 194, 194, 195, - 195, 196, 196, 196, 197, 197, 198, 198, 199, 199, - 200, 200, 201, 201, 202, 202, 202, 203, 203, 204, - 204, 204, 205, 205, 205, 206, 206, 206, 207, 207, - 207, 207, 208, 208, 208, 209, 209, 209, 210, 210, - 211, 211, 212, 212, 213, 213, 214, 214, 214, 215, - 215, 216, 216, 217, 218, 218, 219, 219, 220, 220, - 221, 222, 222, 223, 223, 224, 224, 225, 225, 225, - 226, 226, 227, 227, 228, 228, 229, 229, 230, 230, - 230, 231, 231, 231, 232, 232, 232, 233, 233, 234, - 234, 235, 235, 236, 236, 238, 250, 251, 252, 252, - 252, 252, 252, 253, 255, 267, 268, 269, 269, 269, - 269, 270, 272, 286, 287, 288, 288, 288, 288, 289, - 289, 289, 291, 300, 309, 320, 329, 338, 347, 358, - 367, 378, 391, 406, 417, 434, 451, 464, 479, 488, - 497, 506, 515, 524, 533, 542, 551, 560, 569, 578, - 587, 596, 605, 614, 621, 628, 637, 646, 655, 669, - 678, 687, 696, 703, 710, 736, 744, 751, 758, 765, - 772, 780, 788, 796, 803, 814, 821, 830, 839, 848, - 855, 862, 870, 878, 888, 898, 908, 921, 932, 940, - 953, 962, 971, 980, 990, 1000, 1008, 1021, 1030, 1038, - 1047, 1055, 1068, 1077, 1084, 1094, 1104, 1114, 1124, 1134, - 1144, 1154, 1164, 1171, 1178, 1185, 1194, 1203, 1212, 1219, - 1229, 1246, 1253, 1271, 1284, 1297, 1306, 1315, 1324, 1333, - 1343, 1353, 1362, 1371, 1384, 1397, 1406, 1413, 1422, 1431, - 1440, 1449, 1457, 1470, 1478, 1506, 1513, 1528, 1538, 1548, - 1555, 1562, 1571, 1585, 1604, 1623, 1635, 1647, 1659, 1670, - 1689, 1699, 1708, 1716, 1724, 1737, 1750, 1763, 1776, 1785, - 1794, 1804, 1814, 1827, 1840, 1851, 1864, 1875, 1888, 1898, - 1905, 1912, 1921, 1931, 1941, 1951, 1958, 1965, 1974, 1984, - 1994, 2023, 2033, 2041, 2050, 2065, 2074, 2079, 2080, 2081, - 2081, 2081, 2082, 2082, 2082, 2083, 2083, 2085, 2095, 2104, - 2111, 2121, 2128, 2135, 2142, 2149, 2154, 2155, 2156, 2156, - 2157, 2157, 2158, 2158, 2159, 2160, 2161, 2162, 2163, 2164, - 2166, 2174, 2181, 2189, 2197, 2204, 2211, 2220, 2229, 2238, - 2247, 2256, 2265, 2270, 2271, 2272, 2274, 2280, 2290, 2297, - 2306, 2314, 2320, 2321, 2323, 2323, 2323, 2324, 2324, 2326, - 2336, 2346, 2353, 2360 + 0, 154, 154, 154, 155, 155, 156, 156, 157, 157, + 157, 159, 160, 164, 169, 170, 171, 171, 171, 172, + 172, 173, 173, 174, 174, 175, 175, 176, 176, 176, + 177, 177, 177, 178, 178, 179, 179, 180, 180, 181, + 181, 182, 182, 183, 183, 184, 184, 185, 185, 186, + 186, 186, 187, 187, 187, 188, 188, 188, 189, 189, + 190, 190, 191, 191, 192, 192, 193, 193, 193, 194, + 194, 195, 195, 196, 196, 196, 197, 197, 198, 198, + 199, 199, 200, 200, 200, 201, 201, 202, 202, 203, + 203, 204, 204, 205, 205, 206, 206, 206, 207, 207, + 208, 208, 208, 209, 209, 209, 210, 210, 210, 211, + 211, 211, 211, 212, 212, 212, 213, 213, 213, 214, + 214, 215, 215, 216, 216, 217, 217, 218, 218, 218, + 219, 219, 220, 220, 221, 222, 222, 223, 223, 224, + 224, 225, 226, 226, 227, 227, 228, 228, 229, 229, + 229, 230, 230, 231, 231, 232, 232, 233, 233, 234, + 234, 234, 235, 235, 235, 236, 236, 236, 237, 237, + 238, 238, 239, 239, 240, 240, 242, 254, 255, 256, + 256, 256, 256, 256, 257, 259, 271, 272, 273, 273, + 273, 273, 274, 276, 290, 291, 292, 292, 292, 292, + 293, 293, 293, 295, 304, 313, 324, 333, 342, 351, + 362, 371, 382, 395, 410, 421, 438, 455, 468, 483, + 492, 501, 510, 519, 528, 537, 546, 555, 564, 573, + 582, 591, 600, 609, 618, 625, 632, 641, 650, 659, + 673, 682, 691, 700, 707, 714, 740, 748, 755, 762, + 769, 776, 784, 792, 800, 807, 818, 825, 834, 843, + 852, 859, 866, 874, 882, 892, 902, 912, 925, 936, + 944, 957, 966, 975, 984, 994, 1004, 1012, 1025, 1034, + 1042, 1051, 1059, 1072, 1081, 1088, 1098, 1108, 1118, 1128, + 1138, 1148, 1158, 1168, 1175, 1182, 1189, 1198, 1207, 1216, + 1223, 1233, 1250, 1257, 1275, 1288, 1301, 1310, 1319, 1328, + 1337, 1347, 1357, 1366, 1375, 1388, 1401, 1410, 1417, 1426, + 1435, 1444, 1453, 1461, 1474, 1482, 1510, 1517, 1532, 1542, + 1552, 1559, 1566, 1575, 1589, 1608, 1627, 1639, 1651, 1663, + 1674, 1693, 1703, 1712, 1720, 1728, 1741, 1754, 1767, 1780, + 1789, 1798, 1808, 1818, 1831, 1844, 1855, 1868, 1879, 1892, + 1902, 1909, 1916, 1925, 1935, 1945, 1955, 1962, 1969, 1978, + 1988, 1998, 2027, 2037, 2045, 2054, 2069, 2078, 2083, 2084, + 2085, 2085, 2085, 2086, 2086, 2086, 2087, 2087, 2089, 2099, + 2108, 2115, 2125, 2132, 2139, 2146, 2153, 2158, 2159, 2160, + 2160, 2161, 2161, 2162, 2162, 2163, 2164, 2165, 2166, 2167, + 2168, 2170, 2178, 2185, 2193, 2201, 2208, 2215, 2224, 2233, + 2242, 2251, 2260, 2269, 2274, 2275, 2276, 2278, 2284, 2294, + 2301, 2310, 2318, 2324, 2325, 2327, 2327, 2327, 2328, 2328, + 2329, 2330, 2332, 2342, 2352, 2359, 2366, 2373, 2381, 2394, + 2399, 2400, 2401, 2401, 2403, 2417 }; #endif @@ -1028,12 +1039,15 @@ static const char *const yytname[] = "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "VAR_DNSCRYPT", "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", "VAR_DNSCRYPT_SECRET_KEY", "VAR_DNSCRYPT_PROVIDER_CERT", - "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS", - "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT", - "$accept", "toplevelvars", "toplevelvar", "serverstart", - "contents_server", "content_server", "stubstart", "contents_stub", - "content_stub", "forwardstart", "contents_forward", "content_forward", - "viewstart", "contents_view", "content_view", "server_num_threads", + "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE", + "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS", "VAR_IPSECMOD_ENABLED", + "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS", "VAR_IPSECMOD_MAX_TTL", + "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT", "VAR_CACHEDB", + "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED", "$accept", + "toplevelvars", "toplevelvar", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", "viewstart", + "contents_view", "content_view", "server_num_threads", "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", @@ -1122,7 +1136,11 @@ static const char *const yytname[] = "server_response_ip", "server_response_ip_data", "dnscstart", "contents_dnsc", "content_dnsc", "dnsc_dnscrypt_enable", "dnsc_dnscrypt_port", "dnsc_dnscrypt_provider", - "dnsc_dnscrypt_provider_cert", "dnsc_dnscrypt_secret_key", YY_NULLPTR + "dnsc_dnscrypt_provider_cert", "dnsc_dnscrypt_secret_key", + "dnsc_dnscrypt_shared_secret_cache_size", + "dnsc_dnscrypt_shared_secret_cache_slabs", "cachedbstart", + "contents_cachedb", "content_cachedb", "cachedb_backend_name", + "cachedb_secret_seed", YY_NULLPTR }; #endif @@ -1152,14 +1170,15 @@ static const yytype_uint16 yytoknum[] = 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 + 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, + 475 }; # endif -#define YYPACT_NINF -200 +#define YYPACT_NINF -213 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-200))) + (!!((Yystate) == (-213))) #define YYTABLE_NINF -1 @@ -1170,73 +1189,75 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -200, 0, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - 96, -39, -35, 248, -65, -131, -106, -199, 2, 25, - 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 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, 82, 83, 85, 88, 90, 91, 92, 93, - 94, 95, 126, 127, 128, 129, 133, 134, 177, 178, - 179, 180, 181, 183, 184, 185, 189, 193, 218, 219, - 220, 221, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 280, 290, 291, 292, 293, - 294, 295, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 316, 317, 318, 319, 320, 321, - 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, - 332, 333, 334, 335, 336, 337, 338, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 357, 358, 359, 360, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, 361, - 362, 363, 364, 365, 366, -200, -200, -200, -200, -200, - -200, -200, 367, 368, 369, 370, 371, -200, -200, -200, - -200, -200, -200, 372, 373, 374, 375, 376, 377, 378, - -200, -200, -200, -200, -200, -200, -200, -200, 379, 380, - 381, 382, 383, 384, 385, 386, -200, -200, -200, -200, - -200, -200, -200, -200, -200, 387, 388, 389, 390, 391, - 392, 393, 394, 395, 396, 399, 400, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - 401, -200, -200, 402, 403, 404, 405, 406, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - 407, 408, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, 409, 410, 411, -200, -200, -200, - -200, -200, -200, -200, -200, -200, 412, 413, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, 414, 415, 416, 417, 418, 419, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, 420, -200, -200, 421, - 422, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, 423, 424, 425, - -200, -200, -200, -200, -200, -200, -200 + -213, 0, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, 207, -38, -34, -39, -64, -130, -105, -157, + -212, -1, 2, 3, 26, 29, 30, 32, 33, 34, + 35, 36, 45, 46, 47, 48, 49, 50, 51, 53, + 54, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 82, 83, 84, 86, + 89, 91, 92, 93, 94, 95, 96, 98, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 237, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, 238, 239, 240, 244, 245, 246, -213, -213, + -213, -213, -213, -213, -213, 288, 289, 290, 291, 292, + -213, -213, -213, -213, -213, -213, 293, 294, 295, 296, + 300, 304, 305, -213, -213, -213, -213, -213, -213, -213, + -213, 329, 330, 331, 332, 342, 343, 344, 345, -213, + -213, -213, -213, -213, -213, -213, -213, -213, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 389, 391, 401, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, 402, -213, -213, 403, 404, 405, 406, + 407, 408, 415, -213, -213, -213, -213, -213, -213, -213, + -213, 416, 417, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, 418, 419, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, 420, 421, 422, -213, + -213, -213, -213, -213, -213, -213, -213, -213, 423, 424, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, 425, 426, 427, 428, 429, + 430, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, 431, -213, + -213, 432, 433, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, 434, 435, 436, -213, -213, -213, -213, + -213, -213, -213 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1244,9 +1265,11 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 12, 175, 184, 376, 422, 395, 192, - 431, 3, 14, 177, 186, 194, 378, 397, 424, 433, - 4, 5, 6, 10, 8, 9, 7, 11, 0, 0, + 2, 0, 1, 13, 176, 185, 377, 423, 396, 193, + 432, 449, 3, 15, 178, 187, 195, 379, 398, 425, + 434, 451, 4, 5, 6, 10, 8, 9, 7, 11, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1261,114 +1284,114 @@ 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, 14, 16, 17, 76, 79, 88, 165, 166, 18, + 138, 139, 140, 141, 142, 143, 27, 67, 19, 80, + 81, 38, 60, 75, 20, 21, 23, 24, 22, 25, + 26, 111, 112, 113, 114, 115, 161, 77, 66, 92, + 109, 110, 28, 29, 30, 31, 32, 68, 82, 83, + 98, 54, 64, 55, 169, 93, 48, 49, 168, 50, + 51, 102, 106, 119, 127, 148, 103, 61, 33, 34, + 35, 90, 120, 121, 122, 36, 37, 39, 40, 42, + 43, 41, 125, 44, 45, 46, 52, 71, 107, 85, + 126, 78, 144, 86, 87, 104, 105, 91, 47, 69, + 72, 53, 56, 94, 95, 70, 145, 96, 57, 58, + 59, 108, 158, 159, 167, 97, 65, 99, 100, 101, + 146, 62, 63, 84, 73, 74, 89, 116, 117, 118, + 123, 124, 149, 150, 152, 154, 155, 153, 156, 162, + 128, 129, 132, 133, 130, 131, 134, 135, 137, 136, + 147, 157, 170, 172, 171, 173, 174, 175, 151, 160, + 163, 164, 0, 0, 0, 0, 0, 0, 177, 179, + 180, 181, 183, 184, 182, 0, 0, 0, 0, 0, + 186, 188, 189, 190, 191, 192, 0, 0, 0, 0, + 0, 0, 0, 194, 196, 197, 200, 201, 198, 202, + 199, 0, 0, 0, 0, 0, 0, 0, 0, 378, + 380, 382, 381, 387, 383, 384, 385, 386, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 13, 15, - 16, 75, 78, 87, 164, 165, 17, 137, 138, 139, - 140, 141, 142, 26, 66, 18, 79, 80, 37, 59, - 74, 19, 20, 22, 23, 21, 24, 25, 110, 111, - 112, 113, 114, 160, 76, 65, 91, 108, 109, 27, - 28, 29, 30, 31, 67, 81, 82, 97, 53, 63, - 54, 168, 92, 47, 48, 167, 49, 50, 101, 105, - 118, 126, 147, 102, 60, 32, 33, 34, 89, 119, - 120, 121, 35, 36, 38, 39, 41, 42, 40, 124, - 43, 44, 45, 51, 70, 106, 84, 125, 77, 143, - 85, 86, 103, 104, 90, 46, 68, 71, 52, 55, - 93, 94, 69, 144, 95, 56, 57, 58, 107, 157, - 158, 166, 96, 64, 98, 99, 100, 145, 61, 62, - 83, 72, 73, 88, 115, 116, 117, 122, 123, 148, - 149, 151, 153, 154, 152, 155, 161, 127, 128, 131, - 132, 129, 130, 133, 134, 136, 135, 146, 156, 169, - 171, 170, 172, 173, 174, 150, 159, 162, 163, 0, - 0, 0, 0, 0, 0, 176, 178, 179, 180, 182, - 183, 181, 0, 0, 0, 0, 0, 185, 187, 188, - 189, 190, 191, 0, 0, 0, 0, 0, 0, 0, - 193, 195, 196, 199, 200, 197, 201, 198, 0, 0, - 0, 0, 0, 0, 0, 0, 377, 379, 381, 380, - 386, 382, 383, 384, 385, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 396, 398, 399, - 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, - 0, 423, 425, 0, 0, 0, 0, 0, 432, 434, - 435, 436, 438, 437, 203, 202, 209, 218, 216, 224, - 225, 228, 226, 227, 229, 230, 242, 243, 244, 245, - 246, 268, 269, 270, 275, 276, 221, 277, 278, 281, - 279, 280, 283, 284, 285, 298, 256, 257, 259, 260, - 286, 301, 251, 253, 302, 308, 309, 310, 222, 267, - 321, 322, 252, 316, 238, 217, 247, 299, 305, 287, - 0, 0, 325, 223, 204, 237, 291, 205, 219, 220, - 248, 249, 323, 289, 293, 294, 206, 326, 271, 297, - 239, 255, 303, 304, 307, 315, 250, 319, 317, 318, - 261, 266, 295, 296, 262, 263, 288, 311, 240, 241, - 231, 232, 233, 234, 235, 327, 328, 329, 272, 273, - 274, 282, 330, 331, 0, 0, 0, 290, 264, 427, - 340, 344, 342, 341, 345, 343, 0, 0, 348, 349, - 210, 211, 212, 213, 214, 215, 292, 306, 320, 350, - 351, 265, 332, 0, 0, 0, 0, 0, 0, 312, - 313, 314, 428, 258, 254, 236, 207, 208, 352, 354, - 353, 355, 356, 357, 358, 359, 360, 363, 362, 361, - 364, 365, 366, 367, 368, 369, 0, 373, 374, 0, - 0, 375, 387, 389, 388, 391, 392, 393, 394, 390, - 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, - 420, 421, 426, 439, 440, 441, 443, 442, 300, 324, - 339, 429, 430, 346, 347, 333, 334, 0, 0, 0, - 338, 370, 371, 372, 337, 335, 336 + 397, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 0, 424, 426, 0, 0, 0, 0, + 0, 0, 0, 433, 435, 436, 437, 439, 438, 440, + 441, 0, 0, 450, 452, 453, 204, 203, 210, 219, + 217, 225, 226, 229, 227, 228, 230, 231, 243, 244, + 245, 246, 247, 269, 270, 271, 276, 277, 222, 278, + 279, 282, 280, 281, 284, 285, 286, 299, 257, 258, + 260, 261, 287, 302, 252, 254, 303, 309, 310, 311, + 223, 268, 322, 323, 253, 317, 239, 218, 248, 300, + 306, 288, 0, 0, 326, 224, 205, 238, 292, 206, + 220, 221, 249, 250, 324, 290, 294, 295, 207, 327, + 272, 298, 240, 256, 304, 305, 308, 316, 251, 320, + 318, 319, 262, 267, 296, 297, 263, 264, 289, 312, + 241, 242, 232, 233, 234, 235, 236, 328, 329, 330, + 273, 274, 275, 283, 331, 332, 0, 0, 0, 291, + 265, 428, 341, 345, 343, 342, 346, 344, 0, 0, + 349, 350, 211, 212, 213, 214, 215, 216, 293, 307, + 321, 351, 352, 266, 333, 0, 0, 0, 0, 0, + 0, 313, 314, 315, 429, 259, 255, 237, 208, 209, + 353, 355, 354, 356, 357, 358, 359, 360, 361, 364, + 363, 362, 365, 366, 367, 368, 369, 370, 0, 374, + 375, 0, 0, 376, 388, 390, 389, 392, 393, 394, + 395, 391, 411, 412, 413, 414, 415, 416, 417, 418, + 419, 420, 421, 422, 427, 442, 443, 444, 446, 445, + 447, 448, 454, 455, 301, 325, 340, 430, 431, 347, + 348, 334, 335, 0, 0, 0, 339, 371, 372, 373, + 338, 336, 337 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200, -200, -200, -200, -200, -200, -200, -200, -200, -200, - -200 + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 11, 12, 20, 188, 13, 21, 355, 14, - 22, 367, 15, 23, 380, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, - 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, - 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, - 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, - 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, - 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, - 344, 356, 357, 358, 359, 360, 361, 368, 369, 370, - 371, 372, 381, 382, 383, 384, 385, 386, 387, 16, - 24, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 17, 25, 417, 418, 419, 420, 421, 422, 423, 424, - 425, 426, 427, 428, 429, 18, 26, 431, 432, 345, - 346, 347, 348, 19, 27, 438, 439, 440, 441, 442, - 443 + -1, 1, 12, 13, 22, 191, 14, 23, 358, 15, + 24, 370, 16, 25, 383, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, + 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, + 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, + 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, + 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, + 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, + 347, 359, 360, 361, 362, 363, 364, 371, 372, 373, + 374, 375, 384, 385, 386, 387, 388, 389, 390, 17, + 26, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 18, 27, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 19, 28, 434, 435, 348, + 349, 350, 351, 20, 29, 443, 444, 445, 446, 447, + 448, 449, 450, 21, 30, 453, 454, 455 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1376,151 +1399,152 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 349, 430, 350, 351, 362, 433, 434, 435, 436, - 437, 3, 444, 363, 364, 405, 406, 407, 408, 409, - 410, 411, 412, 413, 414, 415, 416, 388, 389, 390, - 391, 392, 393, 394, 395, 445, 446, 447, 448, 449, - 450, 4, 451, 452, 453, 454, 455, 5, 456, 457, - 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, - 468, 469, 470, 471, 352, 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, 6, 498, 499, 353, 500, 354, 365, 501, 366, - 502, 503, 504, 505, 506, 507, 0, 7, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 508, 509, 510, 511, - 56, 57, 58, 512, 513, 8, 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, 94, 95, 96, 97, 98, 99, 514, 515, 516, - 517, 518, 9, 519, 520, 521, 100, 101, 102, 522, - 103, 104, 105, 523, 10, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 524, 525, - 526, 527, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 528, 529, 530, 531, 532, 533, 534, 535, 536, - 537, 538, 539, 540, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 373, 172, - 541, 173, 174, 175, 176, 177, 178, 179, 180, 181, - 542, 543, 544, 545, 546, 547, 182, 183, 184, 185, - 186, 187, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 374, 375, 560, 561, 562, 563, - 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, - 574, 575, 576, 577, 578, 579, 580, 581, 582, 376, - 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, - 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, - 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, - 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, - 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, - 633, 634, 635, 636, 637, 638, 639, 377, 378, 640, - 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, - 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, - 661, 662, 663, 664, 665, 666, 0, 0, 0, 0, - 0, 0, 379 + 2, 376, 352, 433, 353, 354, 365, 451, 452, 456, + 0, 3, 457, 458, 366, 367, 408, 409, 410, 411, + 412, 413, 414, 415, 416, 417, 418, 419, 391, 392, + 393, 394, 395, 396, 397, 398, 459, 377, 378, 460, + 461, 4, 462, 463, 464, 465, 466, 5, 436, 437, + 438, 439, 440, 441, 442, 467, 468, 469, 470, 471, + 472, 473, 379, 474, 475, 355, 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, 6, 501, 502, 503, 356, 504, 357, 368, 505, + 369, 506, 507, 508, 509, 510, 511, 7, 512, 513, + 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, + 380, 381, 524, 525, 526, 527, 528, 529, 530, 531, + 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, + 542, 543, 544, 545, 546, 8, 547, 548, 549, 550, + 551, 552, 553, 554, 555, 382, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, + 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, + 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, + 590, 591, 9, 592, 593, 594, 595, 596, 597, 598, + 599, 600, 601, 602, 10, 603, 604, 605, 606, 607, + 608, 609, 610, 611, 612, 613, 614, 0, 11, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 615, 616, 617, + 618, 59, 60, 61, 619, 620, 621, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 622, 623, + 624, 625, 626, 627, 628, 629, 630, 103, 104, 105, + 631, 106, 107, 108, 632, 633, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 634, + 635, 636, 637, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 638, 639, 640, 641, 642, 643, 644, 645, + 646, 647, 648, 649, 650, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 651, + 175, 652, 176, 177, 178, 179, 180, 181, 182, 183, + 184, 653, 654, 655, 656, 657, 658, 659, 660, 185, + 186, 187, 188, 189, 190, 661, 662, 663, 664, 665, + 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, + 676, 677, 678, 679, 680, 681, 682 }; static const yytype_int16 yycheck[] = { - 0, 40, 108, 42, 43, 40, 205, 206, 207, 208, - 209, 11, 10, 48, 49, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 92, 93, 94, - 95, 96, 97, 98, 99, 10, 10, 10, 10, 10, - 10, 41, 10, 10, 10, 10, 10, 47, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 103, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 0, 40, 40, 108, 42, 43, 40, 219, 220, 10, + -1, 11, 10, 10, 48, 49, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 92, 93, + 94, 95, 96, 97, 98, 99, 10, 76, 77, 10, + 10, 41, 10, 10, 10, 10, 10, 47, 205, 206, + 207, 208, 209, 210, 211, 10, 10, 10, 10, 10, + 10, 10, 101, 10, 10, 103, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 133, 10, 135, 132, 10, 134, - 10, 10, 10, 10, 10, 10, -1, 107, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 10, 10, 10, 10, - 44, 45, 46, 10, 10, 145, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 10, 10, 10, - 10, 10, 192, 10, 10, 10, 100, 101, 102, 10, - 104, 105, 106, 10, 204, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 10, 10, - 10, 10, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 40, 193, - 10, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 10, 10, 10, 10, 10, 10, 210, 211, 212, 213, - 214, 215, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 76, 77, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 101, + 10, 91, 10, 10, 10, 133, 10, 135, 132, 10, + 134, 10, 10, 10, 10, 10, 10, 107, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 159, 160, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 145, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 194, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 159, 160, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 192, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 204, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, -1, 218, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 10, 10, 10, + 10, 44, 45, 46, 10, 10, 10, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 100, 101, 102, + 10, 104, 105, 106, 10, 10, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 10, + 10, 10, 10, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 158, 159, 160, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 10, + 193, 10, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 10, 10, 10, 10, 10, 10, 10, 10, 212, + 213, 214, 215, 216, 217, 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, 194 + 10, 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 217, 0, 11, 41, 47, 91, 107, 145, 192, - 204, 218, 219, 222, 225, 228, 405, 416, 431, 439, - 220, 223, 226, 229, 406, 417, 432, 440, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 44, 45, 46, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 100, 101, 102, 104, 105, 106, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 193, 195, 196, 197, 198, 199, 200, 201, - 202, 203, 210, 211, 212, 213, 214, 215, 221, 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, 435, 436, 437, 438, 40, - 42, 43, 103, 133, 135, 224, 387, 388, 389, 390, - 391, 392, 40, 48, 49, 132, 134, 227, 393, 394, - 395, 396, 397, 40, 76, 77, 101, 159, 160, 194, - 230, 398, 399, 400, 401, 402, 403, 404, 92, 93, - 94, 95, 96, 97, 98, 99, 407, 408, 409, 410, - 411, 412, 413, 414, 415, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 418, 419, 420, - 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, - 108, 433, 434, 205, 206, 207, 208, 209, 441, 442, - 443, 444, 445, 446, 10, 10, 10, 10, 10, 10, + 0, 222, 0, 11, 41, 47, 91, 107, 145, 192, + 204, 218, 223, 224, 227, 230, 233, 410, 421, 436, + 444, 454, 225, 228, 231, 234, 411, 422, 437, 445, + 455, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 44, + 45, 46, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 100, 101, 102, 104, 105, 106, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 193, 195, 196, 197, 198, + 199, 200, 201, 202, 203, 212, 213, 214, 215, 216, + 217, 226, 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, 440, 441, + 442, 443, 40, 42, 43, 103, 133, 135, 229, 392, + 393, 394, 395, 396, 397, 40, 48, 49, 132, 134, + 232, 398, 399, 400, 401, 402, 40, 76, 77, 101, + 159, 160, 194, 235, 403, 404, 405, 406, 407, 408, + 409, 92, 93, 94, 95, 96, 97, 98, 99, 412, + 413, 414, 415, 416, 417, 418, 419, 420, 146, 147, + 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, + 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, + 433, 434, 435, 108, 438, 439, 205, 206, 207, 208, + 209, 210, 211, 446, 447, 448, 449, 450, 451, 452, + 453, 219, 220, 456, 457, 458, 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, @@ -1542,64 +1566,66 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 216, 217, 217, 218, 218, 218, 218, 218, 218, - 218, 218, 219, 220, 220, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, 221, 221, - 221, 221, 221, 221, 221, 222, 223, 223, 224, 224, - 224, 224, 224, 224, 225, 226, 226, 227, 227, 227, - 227, 227, 228, 229, 229, 230, 230, 230, 230, 230, - 230, 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, 406, 407, - 407, 407, 407, 407, 407, 407, 407, 408, 409, 410, - 411, 412, 413, 414, 415, 416, 417, 417, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, - 429, 430, 431, 432, 432, 433, 434, 435, 436, 437, - 438, 439, 440, 440, 441, 441, 441, 441, 441, 442, - 443, 444, 445, 446 + 0, 221, 222, 222, 223, 223, 223, 223, 223, 223, + 223, 223, 223, 224, 225, 225, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, + 226, 226, 226, 226, 226, 226, 227, 228, 228, 229, + 229, 229, 229, 229, 229, 230, 231, 231, 232, 232, + 232, 232, 232, 233, 234, 234, 235, 235, 235, 235, + 235, 235, 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, 411, + 412, 412, 412, 412, 412, 412, 412, 412, 413, 414, + 415, 416, 417, 418, 419, 420, 421, 422, 422, 423, + 423, 423, 423, 423, 423, 423, 423, 423, 423, 423, + 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, + 433, 434, 435, 436, 437, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 445, 446, 446, 446, 446, 446, + 446, 446, 447, 448, 449, 450, 451, 452, 453, 454, + 455, 455, 456, 456, 457, 458 }; /* 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, 1, 2, 0, 1, 1, 1, 1, 1, + 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1615,10 +1641,10 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1628,21 +1654,22 @@ 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, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 4, 4, 4, 3, 3, - 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, + 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 4, 4, 4, 3, + 3, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 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, + 2, 3, 3, 3, 2, 2, 2, 1, 2, 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 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, 2, - 2, 2, 2, 2 + 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, 2, 2, 2, 2, 2, 2, 2, 1, + 2, 0, 1, 1, 2, 2 }; @@ -2318,16 +2345,16 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 12: -#line 161 "util/configparser.y" /* yacc.c:1646 */ + case 13: +#line 165 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2327 "util/configparser.c" /* yacc.c:1646 */ +#line 2354 "util/configparser.c" /* yacc.c:1646 */ break; - case 175: -#line 239 "util/configparser.y" /* yacc.c:1646 */ + case 176: +#line 243 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2338,11 +2365,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2342 "util/configparser.c" /* yacc.c:1646 */ +#line 2369 "util/configparser.c" /* yacc.c:1646 */ break; - case 184: -#line 256 "util/configparser.y" /* yacc.c:1646 */ + case 185: +#line 260 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2353,11 +2380,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2357 "util/configparser.c" /* yacc.c:1646 */ +#line 2384 "util/configparser.c" /* yacc.c:1646 */ break; - case 192: -#line 273 "util/configparser.y" /* yacc.c:1646 */ + case 193: +#line 277 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2370,11 +2397,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2374 "util/configparser.c" /* yacc.c:1646 */ +#line 2401 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 292 "util/configparser.y" /* yacc.c:1646 */ + case 203: +#line 296 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2382,11 +2409,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2386 "util/configparser.c" /* yacc.c:1646 */ +#line 2413 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: -#line 301 "util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 305 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2394,11 +2421,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2398 "util/configparser.c" /* yacc.c:1646 */ +#line 2425 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 310 "util/configparser.y" /* yacc.c:1646 */ + case 205: +#line 314 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2408,11 +2435,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2412 "util/configparser.c" /* yacc.c:1646 */ +#line 2439 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 321 "util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 325 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2420,11 +2447,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2424 "util/configparser.c" /* yacc.c:1646 */ +#line 2451 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 330 "util/configparser.y" /* yacc.c:1646 */ + case 207: +#line 334 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2432,11 +2459,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2436 "util/configparser.c" /* yacc.c:1646 */ +#line 2463 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 339 "util/configparser.y" /* yacc.c:1646 */ + case 208: +#line 343 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2444,11 +2471,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2448 "util/configparser.c" /* yacc.c:1646 */ +#line 2475 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 348 "util/configparser.y" /* yacc.c:1646 */ + case 209: +#line 352 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2458,11 +2485,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2462 "util/configparser.c" /* yacc.c:1646 */ +#line 2489 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 359 "util/configparser.y" /* yacc.c:1646 */ + case 210: +#line 363 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2470,11 +2497,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2474 "util/configparser.c" /* yacc.c:1646 */ +#line 2501 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 368 "util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 372 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2484,11 +2511,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2488 "util/configparser.c" /* yacc.c:1646 */ +#line 2515 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 379 "util/configparser.y" /* yacc.c:1646 */ + case 212: +#line 383 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2499,11 +2526,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2503 "util/configparser.c" /* yacc.c:1646 */ +#line 2530 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 392 "util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 396 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2517,11 +2544,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2521 "util/configparser.c" /* yacc.c:1646 */ +#line 2548 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 407 "util/configparser.y" /* yacc.c:1646 */ + case 214: +#line 411 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2531,11 +2558,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2535 "util/configparser.c" /* yacc.c:1646 */ +#line 2562 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 418 "util/configparser.y" /* yacc.c:1646 */ + case 215: +#line 422 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2551,11 +2578,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2555 "util/configparser.c" /* yacc.c:1646 */ +#line 2582 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 435 "util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 439 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2571,11 +2598,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2575 "util/configparser.c" /* yacc.c:1646 */ +#line 2602 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 452 "util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 456 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2587,11 +2614,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2591 "util/configparser.c" /* yacc.c:1646 */ +#line 2618 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 465 "util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 469 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2605,11 +2632,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2609 "util/configparser.c" /* yacc.c:1646 */ +#line 2636 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 480 "util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 484 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2617,11 +2644,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2621 "util/configparser.c" /* yacc.c:1646 */ +#line 2648 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 489 "util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 493 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2629,11 +2656,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2633 "util/configparser.c" /* yacc.c:1646 */ +#line 2660 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 498 "util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 502 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2641,11 +2668,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2645 "util/configparser.c" /* yacc.c:1646 */ +#line 2672 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 507 "util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 511 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2653,11 +2680,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2657 "util/configparser.c" /* yacc.c:1646 */ +#line 2684 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 516 "util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 520 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2665,11 +2692,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2669 "util/configparser.c" /* yacc.c:1646 */ +#line 2696 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 525 "util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 529 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2677,11 +2704,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2681 "util/configparser.c" /* yacc.c:1646 */ +#line 2708 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 534 "util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 538 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2689,11 +2716,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2693 "util/configparser.c" /* yacc.c:1646 */ +#line 2720 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 543 "util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 547 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2701,11 +2728,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2705 "util/configparser.c" /* yacc.c:1646 */ +#line 2732 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 552 "util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 556 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2713,11 +2740,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2717 "util/configparser.c" /* yacc.c:1646 */ +#line 2744 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 561 "util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 565 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2725,11 +2752,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2729 "util/configparser.c" /* yacc.c:1646 */ +#line 2756 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 570 "util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 574 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2737,11 +2764,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2741 "util/configparser.c" /* yacc.c:1646 */ +#line 2768 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 579 "util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 583 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2749,11 +2776,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2753 "util/configparser.c" /* yacc.c:1646 */ +#line 2780 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 588 "util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 592 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2761,11 +2788,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2765 "util/configparser.c" /* yacc.c:1646 */ +#line 2792 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 597 "util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 601 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2773,11 +2800,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2777 "util/configparser.c" /* yacc.c:1646 */ +#line 2804 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 606 "util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 610 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2785,31 +2812,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2789 "util/configparser.c" /* yacc.c:1646 */ +#line 2816 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 615 "util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 619 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_key); cfg_parser->cfg->ssl_service_key = (yyvsp[0].str); } -#line 2799 "util/configparser.c" /* yacc.c:1646 */ +#line 2826 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 622 "util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 626 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->ssl_service_pem); cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str); } -#line 2809 "util/configparser.c" /* yacc.c:1646 */ +#line 2836 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 629 "util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 633 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2817,11 +2844,11 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2821 "util/configparser.c" /* yacc.c:1646 */ +#line 2848 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 638 "util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 642 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2829,11 +2856,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2833 "util/configparser.c" /* yacc.c:1646 */ +#line 2860 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 647 "util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 651 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2841,11 +2868,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2845 "util/configparser.c" /* yacc.c:1646 */ +#line 2872 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 656 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 660 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2858,11 +2885,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2862 "util/configparser.c" /* yacc.c:1646 */ +#line 2889 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 670 "util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 674 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2870,11 +2897,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2874 "util/configparser.c" /* yacc.c:1646 */ +#line 2901 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 679 "util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 683 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2882,11 +2909,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2886 "util/configparser.c" /* yacc.c:1646 */ +#line 2913 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 688 "util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 692 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2894,31 +2921,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2898 "util/configparser.c" /* yacc.c:1646 */ +#line 2925 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 697 "util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 701 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 2908 "util/configparser.c" /* yacc.c:1646 */ +#line 2935 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 704 "util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 708 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 2918 "util/configparser.c" /* yacc.c:1646 */ +#line 2945 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 711 "util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 715 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -2943,105 +2970,105 @@ yyreduce: } } } -#line 2947 "util/configparser.c" /* yacc.c:1646 */ +#line 2974 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 737 "util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 741 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 2958 "util/configparser.c" /* yacc.c:1646 */ +#line 2985 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 745 "util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 749 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 2968 "util/configparser.c" /* yacc.c:1646 */ +#line 2995 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 752 "util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 756 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 2978 "util/configparser.c" /* yacc.c:1646 */ +#line 3005 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 759 "util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 763 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 2988 "util/configparser.c" /* yacc.c:1646 */ +#line 3015 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 766 "util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 770 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 2998 "util/configparser.c" /* yacc.c:1646 */ +#line 3025 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 773 "util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 777 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3009 "util/configparser.c" /* yacc.c:1646 */ +#line 3036 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 781 "util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 785 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3020 "util/configparser.c" /* yacc.c:1646 */ +#line 3047 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 789 "util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 793 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3031 "util/configparser.c" /* yacc.c:1646 */ +#line 3058 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 797 "util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 801 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3041 "util/configparser.c" /* yacc.c:1646 */ +#line 3068 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 804 "util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 808 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3051,21 +3078,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3055 "util/configparser.c" /* yacc.c:1646 */ +#line 3082 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 815 "util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 819 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3065 "util/configparser.c" /* yacc.c:1646 */ +#line 3092 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 822 "util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 826 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3073,11 +3100,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3077 "util/configparser.c" /* yacc.c:1646 */ +#line 3104 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 831 "util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 835 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3085,11 +3112,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3089 "util/configparser.c" /* yacc.c:1646 */ +#line 3116 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 840 "util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 844 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3097,53 +3124,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3101 "util/configparser.c" /* yacc.c:1646 */ +#line 3128 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 849 "util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 853 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3111 "util/configparser.c" /* yacc.c:1646 */ +#line 3138 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 856 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 860 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3121 "util/configparser.c" /* yacc.c:1646 */ +#line 3148 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 863 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 867 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3132 "util/configparser.c" /* yacc.c:1646 */ +#line 3159 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 871 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 875 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 3143 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 879 "util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 883 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3152,11 +3179,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3156 "util/configparser.c" /* yacc.c:1646 */ +#line 3183 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 889 "util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 893 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3165,11 +3192,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3169 "util/configparser.c" /* yacc.c:1646 */ +#line 3196 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 899 "util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 903 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3178,11 +3205,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3182 "util/configparser.c" /* yacc.c:1646 */ +#line 3209 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 909 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 913 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3194,11 +3221,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3198 "util/configparser.c" /* yacc.c:1646 */ +#line 3225 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 922 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 926 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3208,22 +3235,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3212 "util/configparser.c" /* yacc.c:1646 */ +#line 3239 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 933 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 937 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3223 "util/configparser.c" /* yacc.c:1646 */ +#line 3250 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 941 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 945 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3235,11 +3262,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3239 "util/configparser.c" /* yacc.c:1646 */ +#line 3266 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 954 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 958 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3247,11 +3274,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3251 "util/configparser.c" /* yacc.c:1646 */ +#line 3278 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 963 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 967 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3259,11 +3286,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3263 "util/configparser.c" /* yacc.c:1646 */ +#line 3290 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 972 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 976 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3271,11 +3298,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3275 "util/configparser.c" /* yacc.c:1646 */ +#line 3302 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 981 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 985 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3284,11 +3311,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3288 "util/configparser.c" /* yacc.c:1646 */ +#line 3315 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 991 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 995 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3297,22 +3324,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3301 "util/configparser.c" /* yacc.c:1646 */ +#line 3328 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 1001 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 1005 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3312 "util/configparser.c" /* yacc.c:1646 */ +#line 3339 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1009 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1013 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3324,11 +3351,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3328 "util/configparser.c" /* yacc.c:1646 */ +#line 3355 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1022 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1026 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3336,22 +3363,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3340 "util/configparser.c" /* yacc.c:1646 */ +#line 3367 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1031 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1035 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3351 "util/configparser.c" /* yacc.c:1646 */ +#line 3378 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1039 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1043 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3359,22 +3386,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3363 "util/configparser.c" /* yacc.c:1646 */ +#line 3390 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1048 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1052 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3374 "util/configparser.c" /* yacc.c:1646 */ +#line 3401 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1056 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1060 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3386,11 +3413,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3390 "util/configparser.c" /* yacc.c:1646 */ +#line 3417 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1069 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1073 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3398,21 +3425,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3402 "util/configparser.c" /* yacc.c:1646 */ +#line 3429 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1078 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1082 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 3412 "util/configparser.c" /* yacc.c:1646 */ +#line 3439 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1085 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1089 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3421,11 +3448,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3425 "util/configparser.c" /* yacc.c:1646 */ +#line 3452 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1095 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1099 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3434,11 +3461,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3438 "util/configparser.c" /* yacc.c:1646 */ +#line 3465 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1105 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1109 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3447,11 +3474,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3451 "util/configparser.c" /* yacc.c:1646 */ +#line 3478 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1115 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1119 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3460,11 +3487,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3464 "util/configparser.c" /* yacc.c:1646 */ +#line 3491 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1125 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1129 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3473,11 +3500,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3477 "util/configparser.c" /* yacc.c:1646 */ +#line 3504 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1135 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1139 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3486,11 +3513,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3490 "util/configparser.c" /* yacc.c:1646 */ +#line 3517 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1145 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1149 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3499,11 +3526,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3503 "util/configparser.c" /* yacc.c:1646 */ +#line 3530 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1155 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1159 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3512,41 +3539,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3516 "util/configparser.c" /* yacc.c:1646 */ +#line 3543 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1165 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1169 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3526 "util/configparser.c" /* yacc.c:1646 */ +#line 3553 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1172 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1176 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3536 "util/configparser.c" /* yacc.c:1646 */ +#line 3563 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1179 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1183 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3546 "util/configparser.c" /* yacc.c:1646 */ +#line 3573 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1186 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1190 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3554,11 +3581,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3558 "util/configparser.c" /* yacc.c:1646 */ +#line 3585 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1195 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1199 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3566,11 +3593,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3570 "util/configparser.c" /* yacc.c:1646 */ +#line 3597 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1204 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1208 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3578,21 +3605,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3582 "util/configparser.c" /* yacc.c:1646 */ +#line 3609 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1213 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1217 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3592 "util/configparser.c" /* yacc.c:1646 */ +#line 3619 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1220 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1224 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3601,11 +3628,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3605 "util/configparser.c" /* yacc.c:1646 */ +#line 3632 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1230 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1234 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -3621,21 +3648,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3625 "util/configparser.c" /* yacc.c:1646 */ +#line 3652 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1247 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1251 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 3635 "util/configparser.c" /* yacc.c:1646 */ +#line 3662 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1254 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1258 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3652,11 +3679,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3656 "util/configparser.c" /* yacc.c:1646 */ +#line 3683 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1272 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1276 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3668,11 +3695,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3672 "util/configparser.c" /* yacc.c:1646 */ +#line 3699 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1285 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1289 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3684,11 +3711,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3688 "util/configparser.c" /* yacc.c:1646 */ +#line 3715 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1298 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1302 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3696,11 +3723,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3700 "util/configparser.c" /* yacc.c:1646 */ +#line 3727 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1307 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1311 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3708,11 +3735,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3712 "util/configparser.c" /* yacc.c:1646 */ +#line 3739 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1316 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1320 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3720,11 +3747,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3724 "util/configparser.c" /* yacc.c:1646 */ +#line 3751 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1325 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1329 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3732,11 +3759,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3736 "util/configparser.c" /* yacc.c:1646 */ +#line 3763 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1334 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1338 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3745,11 +3772,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3749 "util/configparser.c" /* yacc.c:1646 */ +#line 3776 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1344 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1348 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3758,11 +3785,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3762 "util/configparser.c" /* yacc.c:1646 */ +#line 3789 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1354 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1358 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3770,11 +3797,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3774 "util/configparser.c" /* yacc.c:1646 */ +#line 3801 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1363 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1367 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3782,11 +3809,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3786 "util/configparser.c" /* yacc.c:1646 */ +#line 3813 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1372 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1376 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3798,11 +3825,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3802 "util/configparser.c" /* yacc.c:1646 */ +#line 3829 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1385 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1389 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3814,11 +3841,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3818 "util/configparser.c" /* yacc.c:1646 */ +#line 3845 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1398 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1402 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3826,21 +3853,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3830 "util/configparser.c" /* yacc.c:1646 */ +#line 3857 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1407 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1411 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 3840 "util/configparser.c" /* yacc.c:1646 */ +#line 3867 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1414 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1418 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3848,11 +3875,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3852 "util/configparser.c" /* yacc.c:1646 */ +#line 3879 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1423 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1427 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3860,11 +3887,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3864 "util/configparser.c" /* yacc.c:1646 */ +#line 3891 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1432 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1436 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3872,11 +3899,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3876 "util/configparser.c" /* yacc.c:1646 */ +#line 3903 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1441 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1445 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3885,22 +3912,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3889 "util/configparser.c" /* yacc.c:1646 */ +#line 3916 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1450 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1454 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3900 "util/configparser.c" /* yacc.c:1646 */ +#line 3927 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1458 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1462 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3912,22 +3939,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3916 "util/configparser.c" /* yacc.c:1646 */ +#line 3943 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1471 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1475 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3927 "util/configparser.c" /* yacc.c:1646 */ +#line 3954 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1479 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1483 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -3954,21 +3981,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3958 "util/configparser.c" /* yacc.c:1646 */ +#line 3985 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1507 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1511 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 3968 "util/configparser.c" /* yacc.c:1646 */ +#line 3995 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1514 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1518 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -3982,11 +4009,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 3986 "util/configparser.c" /* yacc.c:1646 */ +#line 4013 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1529 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1533 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3995,11 +4022,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3999 "util/configparser.c" /* yacc.c:1646 */ +#line 4026 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1539 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1543 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4008,31 +4035,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4012 "util/configparser.c" /* yacc.c:1646 */ +#line 4039 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1549 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1553 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4022 "util/configparser.c" /* yacc.c:1646 */ +#line 4049 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1556 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1560 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4032 "util/configparser.c" /* yacc.c:1646 */ +#line 4059 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1563 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1567 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4040,11 +4067,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4044 "util/configparser.c" /* yacc.c:1646 */ +#line 4071 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1572 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1576 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4057,11 +4084,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4061 "util/configparser.c" /* yacc.c:1646 */ +#line 4088 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1586 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1590 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4079,11 +4106,11 @@ yyreduce: } } } -#line 4083 "util/configparser.c" /* yacc.c:1646 */ +#line 4110 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1605 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1609 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4101,11 +4128,11 @@ yyreduce: } } } -#line 4105 "util/configparser.c" /* yacc.c:1646 */ +#line 4132 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1624 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1628 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -4116,11 +4143,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4120 "util/configparser.c" /* yacc.c:1646 */ +#line 4147 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1636 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1640 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -4131,11 +4158,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4135 "util/configparser.c" /* yacc.c:1646 */ +#line 4162 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1648 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1652 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -4146,11 +4173,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4150 "util/configparser.c" /* yacc.c:1646 */ +#line 4177 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1660 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1664 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4160,11 +4187,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4164 "util/configparser.c" /* yacc.c:1646 */ +#line 4191 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1671 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1675 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4182,11 +4209,11 @@ yyreduce: } } } -#line 4186 "util/configparser.c" /* yacc.c:1646 */ +#line 4213 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1690 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1694 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4194,11 +4221,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4198 "util/configparser.c" /* yacc.c:1646 */ +#line 4225 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1700 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1704 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4206,33 +4233,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4210 "util/configparser.c" /* yacc.c:1646 */ +#line 4237 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1709 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1713 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4221 "util/configparser.c" /* yacc.c:1646 */ +#line 4248 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1717 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1721 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4232 "util/configparser.c" /* yacc.c:1646 */ +#line 4259 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1725 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1729 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4244,11 +4271,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4248 "util/configparser.c" /* yacc.c:1646 */ +#line 4275 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1738 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1742 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4260,11 +4287,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4264 "util/configparser.c" /* yacc.c:1646 */ +#line 4291 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1751 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1755 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4276,11 +4303,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4280 "util/configparser.c" /* yacc.c:1646 */ +#line 4307 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1764 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1768 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -4292,11 +4319,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4296 "util/configparser.c" /* yacc.c:1646 */ +#line 4323 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1777 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1781 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4304,11 +4331,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4308 "util/configparser.c" /* yacc.c:1646 */ +#line 4335 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1786 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1790 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4316,11 +4343,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4320 "util/configparser.c" /* yacc.c:1646 */ +#line 4347 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1795 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1799 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4329,11 +4356,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4333 "util/configparser.c" /* yacc.c:1646 */ +#line 4360 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1805 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1809 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4342,11 +4369,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4346 "util/configparser.c" /* yacc.c:1646 */ +#line 4373 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1815 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1819 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4358,11 +4385,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4362 "util/configparser.c" /* yacc.c:1646 */ +#line 4389 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1828 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1832 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4374,11 +4401,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4378 "util/configparser.c" /* yacc.c:1646 */ +#line 4405 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1841 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1845 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4388,11 +4415,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4392 "util/configparser.c" /* yacc.c:1646 */ +#line 4419 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1852 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1856 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4404,11 +4431,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4408 "util/configparser.c" /* yacc.c:1646 */ +#line 4435 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1865 "util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1869 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4418,11 +4445,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4422 "util/configparser.c" /* yacc.c:1646 */ +#line 4449 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1876 "util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1880 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4434,11 +4461,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4438 "util/configparser.c" /* yacc.c:1646 */ +#line 4465 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1889 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1893 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4447,31 +4474,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4451 "util/configparser.c" /* yacc.c:1646 */ +#line 4478 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1899 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1903 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4461 "util/configparser.c" /* yacc.c:1646 */ +#line 4488 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1906 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1910 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4471 "util/configparser.c" /* yacc.c:1646 */ +#line 4498 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1913 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1917 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4479,11 +4506,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4483 "util/configparser.c" /* yacc.c:1646 */ +#line 4510 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1922 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1926 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4492,11 +4519,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4496 "util/configparser.c" /* yacc.c:1646 */ +#line 4523 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1932 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1936 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4505,11 +4532,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4509 "util/configparser.c" /* yacc.c:1646 */ +#line 4536 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1942 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1946 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4518,31 +4545,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4522 "util/configparser.c" /* yacc.c:1646 */ +#line 4549 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1952 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1956 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4532 "util/configparser.c" /* yacc.c:1646 */ +#line 4559 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1959 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1963 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4542 "util/configparser.c" /* yacc.c:1646 */ +#line 4569 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1966 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1970 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4550,11 +4577,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4554 "util/configparser.c" /* yacc.c:1646 */ +#line 4581 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1975 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1979 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4563,11 +4590,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4567 "util/configparser.c" /* yacc.c:1646 */ +#line 4594 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1985 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1989 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4576,11 +4603,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4580 "util/configparser.c" /* yacc.c:1646 */ +#line 4607 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1995 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1999 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -4608,11 +4635,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4612 "util/configparser.c" /* yacc.c:1646 */ +#line 4639 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 2024 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 2028 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4621,22 +4648,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4625 "util/configparser.c" /* yacc.c:1646 */ +#line 4652 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 2034 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 2038 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 4636 "util/configparser.c" /* yacc.c:1646 */ +#line 4663 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 2042 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 2046 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -4644,11 +4671,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4648 "util/configparser.c" /* yacc.c:1646 */ +#line 4675 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 2051 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 2055 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4662,11 +4689,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4666 "util/configparser.c" /* yacc.c:1646 */ +#line 4693 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 2066 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 2070 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4674,19 +4701,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4678 "util/configparser.c" /* yacc.c:1646 */ +#line 4705 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 2075 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 2079 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4686 "util/configparser.c" /* yacc.c:1646 */ +#line 4713 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 2086 "util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 2090 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4695,11 +4722,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4699 "util/configparser.c" /* yacc.c:1646 */ +#line 4726 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2096 "util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 2100 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4707,21 +4734,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4711 "util/configparser.c" /* yacc.c:1646 */ +#line 4738 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2105 "util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 2109 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4721 "util/configparser.c" /* yacc.c:1646 */ +#line 4748 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2112 "util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 2116 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4730,122 +4757,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4734 "util/configparser.c" /* yacc.c:1646 */ +#line 4761 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2122 "util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 2126 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 4744 "util/configparser.c" /* yacc.c:1646 */ +#line 4771 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2129 "util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 2133 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 4754 "util/configparser.c" /* yacc.c:1646 */ +#line 4781 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2136 "util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 2140 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 4764 "util/configparser.c" /* yacc.c:1646 */ +#line 4791 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2143 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 2147 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 4774 "util/configparser.c" /* yacc.c:1646 */ +#line 4801 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2150 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2154 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4782 "util/configparser.c" /* yacc.c:1646 */ +#line 4809 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 2167 "util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 2171 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4793 "util/configparser.c" /* yacc.c:1646 */ +#line 4820 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2175 "util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2179 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 4803 "util/configparser.c" /* yacc.c:1646 */ +#line 4830 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2182 "util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2186 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4814 "util/configparser.c" /* yacc.c:1646 */ +#line 4841 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2190 "util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2194 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4825 "util/configparser.c" /* yacc.c:1646 */ +#line 4852 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2198 "util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2202 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 4835 "util/configparser.c" /* yacc.c:1646 */ +#line 4862 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2205 "util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2209 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 4845 "util/configparser.c" /* yacc.c:1646 */ +#line 4872 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 2212 "util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2216 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4853,11 +4880,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4857 "util/configparser.c" /* yacc.c:1646 */ +#line 4884 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 2221 "util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 2225 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4865,11 +4892,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4869 "util/configparser.c" /* yacc.c:1646 */ +#line 4896 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 2230 "util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2234 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4877,11 +4904,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4881 "util/configparser.c" /* yacc.c:1646 */ +#line 4908 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 2239 "util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2243 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4889,11 +4916,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4893 "util/configparser.c" /* yacc.c:1646 */ +#line 4920 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 2248 "util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 2252 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4901,11 +4928,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4905 "util/configparser.c" /* yacc.c:1646 */ +#line 4932 "util/configparser.c" /* yacc.c:1646 */ break; - case 421: -#line 2257 "util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2261 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4913,29 +4940,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4917 "util/configparser.c" /* yacc.c:1646 */ +#line 4944 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 2266 "util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2270 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4925 "util/configparser.c" /* yacc.c:1646 */ +#line 4952 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 2275 "util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2279 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 4935 "util/configparser.c" /* yacc.c:1646 */ +#line 4962 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2281 "util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2285 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4944,21 +4971,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4948 "util/configparser.c" /* yacc.c:1646 */ +#line 4975 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2291 "util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2295 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 4958 "util/configparser.c" /* yacc.c:1646 */ +#line 4985 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2298 "util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2302 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -4966,31 +4993,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 4970 "util/configparser.c" /* yacc.c:1646 */ +#line 4997 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2307 "util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2311 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 4981 "util/configparser.c" /* yacc.c:1646 */ +#line 5008 "util/configparser.c" /* yacc.c:1646 */ break; - case 431: -#line 2315 "util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2319 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 4990 "util/configparser.c" /* yacc.c:1646 */ +#line 5017 "util/configparser.c" /* yacc.c:1646 */ break; - case 439: -#line 2327 "util/configparser.y" /* yacc.c:1646 */ + case 442: +#line 2333 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4998,11 +5025,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5002 "util/configparser.c" /* yacc.c:1646 */ +#line 5029 "util/configparser.c" /* yacc.c:1646 */ break; - case 440: -#line 2337 "util/configparser.y" /* yacc.c:1646 */ + case 443: +#line 2343 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5011,41 +5038,111 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5015 "util/configparser.c" /* yacc.c:1646 */ +#line 5042 "util/configparser.c" /* yacc.c:1646 */ break; - case 441: -#line 2347 "util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2353 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 5025 "util/configparser.c" /* yacc.c:1646 */ +#line 5052 "util/configparser.c" /* yacc.c:1646 */ break; - case 442: -#line 2354 "util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2360 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5035 "util/configparser.c" /* yacc.c:1646 */ +#line 5062 "util/configparser.c" /* yacc.c:1646 */ break; - case 443: -#line 2361 "util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2367 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5045 "util/configparser.c" /* yacc.c:1646 */ +#line 5072 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 447: +#line 2374 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); + if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) + yyerror("memory size expected"); + free((yyvsp[0].str)); + } +#line 5083 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 448: +#line 2382 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0) + yyerror("number expected"); + else { + cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi((yyvsp[0].str)); + if(!is_pow2(cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs)) + yyerror("must be a power of 2"); + } + free((yyvsp[0].str)); + } +#line 5099 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 449: +#line 2395 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(cachedb:)\n")); + } +#line 5107 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 454: +#line 2404 "util/configparser.y" /* yacc.c:1646 */ + { + #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 + OUTYY(("P(Compiled without cachedb, ignoring)\n")); + #endif + } +#line 5124 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 455: +#line 2418 "util/configparser.y" /* yacc.c:1646 */ + { + #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 + OUTYY(("P(Compiled without cachedb, ignoring)\n")); + free((yyvsp[0].str)); + #endif + } +#line 5142 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5049 "util/configparser.c" /* yacc.c:1646 */ +#line 5146 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5273,7 +5370,7 @@ yyreturn: #endif return yyresult; } -#line 2367 "util/configparser.y" /* yacc.c:1906 */ +#line 2432 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |