diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 2569 |
1 files changed, 1359 insertions, 1210 deletions
diff --git a/util/configparser.c b/util/configparser.c index 421339fe97542..d0e99df817693 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -329,34 +329,42 @@ extern int yydebug; VAR_USE_SYSTEMD = 458, VAR_SHM_ENABLE = 459, VAR_SHM_KEY = 460, - VAR_DNSCRYPT = 461, - VAR_DNSCRYPT_ENABLE = 462, - VAR_DNSCRYPT_PORT = 463, - VAR_DNSCRYPT_PROVIDER = 464, - VAR_DNSCRYPT_SECRET_KEY = 465, - VAR_DNSCRYPT_PROVIDER_CERT = 466, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 467, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 468, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 469, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 470, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 471, - VAR_IPSECMOD_ENABLED = 472, - VAR_IPSECMOD_HOOK = 473, - VAR_IPSECMOD_IGNORE_BOGUS = 474, - VAR_IPSECMOD_MAX_TTL = 475, - VAR_IPSECMOD_WHITELIST = 476, - VAR_IPSECMOD_STRICT = 477, - VAR_CACHEDB = 478, - VAR_CACHEDB_BACKEND = 479, - VAR_CACHEDB_SECRETSEED = 480, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 481, - VAR_FOR_UPSTREAM = 482, - VAR_AUTH_ZONE = 483, - VAR_ZONEFILE = 484, - VAR_MASTER = 485, - VAR_URL = 486, - VAR_FOR_DOWNSTREAM = 487, - VAR_FALLBACK_ENABLED = 488 + VAR_ROOT_KEY_SENTINEL = 461, + VAR_DNSCRYPT = 462, + VAR_DNSCRYPT_ENABLE = 463, + VAR_DNSCRYPT_PORT = 464, + VAR_DNSCRYPT_PROVIDER = 465, + VAR_DNSCRYPT_SECRET_KEY = 466, + VAR_DNSCRYPT_PROVIDER_CERT = 467, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 468, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 469, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 470, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 471, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 472, + VAR_IPSECMOD_ENABLED = 473, + VAR_IPSECMOD_HOOK = 474, + VAR_IPSECMOD_IGNORE_BOGUS = 475, + VAR_IPSECMOD_MAX_TTL = 476, + VAR_IPSECMOD_WHITELIST = 477, + VAR_IPSECMOD_STRICT = 478, + VAR_CACHEDB = 479, + VAR_CACHEDB_BACKEND = 480, + VAR_CACHEDB_SECRETSEED = 481, + VAR_CACHEDB_REDISHOST = 482, + VAR_CACHEDB_REDISPORT = 483, + VAR_CACHEDB_REDISTIMEOUT = 484, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 485, + VAR_FOR_UPSTREAM = 486, + VAR_AUTH_ZONE = 487, + VAR_ZONEFILE = 488, + VAR_MASTER = 489, + VAR_URL = 490, + VAR_FOR_DOWNSTREAM = 491, + VAR_FALLBACK_ENABLED = 492, + VAR_ADDITIONAL_TLS_PORT = 493, + VAR_LOW_RTT = 494, + VAR_LOW_RTT_PCT = 495, + VAR_ALLOW_NOTIFY = 496 }; #endif /* Tokens. */ @@ -563,34 +571,42 @@ extern int yydebug; #define VAR_USE_SYSTEMD 458 #define VAR_SHM_ENABLE 459 #define VAR_SHM_KEY 460 -#define VAR_DNSCRYPT 461 -#define VAR_DNSCRYPT_ENABLE 462 -#define VAR_DNSCRYPT_PORT 463 -#define VAR_DNSCRYPT_PROVIDER 464 -#define VAR_DNSCRYPT_SECRET_KEY 465 -#define VAR_DNSCRYPT_PROVIDER_CERT 466 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 467 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 468 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 469 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 470 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 471 -#define VAR_IPSECMOD_ENABLED 472 -#define VAR_IPSECMOD_HOOK 473 -#define VAR_IPSECMOD_IGNORE_BOGUS 474 -#define VAR_IPSECMOD_MAX_TTL 475 -#define VAR_IPSECMOD_WHITELIST 476 -#define VAR_IPSECMOD_STRICT 477 -#define VAR_CACHEDB 478 -#define VAR_CACHEDB_BACKEND 479 -#define VAR_CACHEDB_SECRETSEED 480 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 481 -#define VAR_FOR_UPSTREAM 482 -#define VAR_AUTH_ZONE 483 -#define VAR_ZONEFILE 484 -#define VAR_MASTER 485 -#define VAR_URL 486 -#define VAR_FOR_DOWNSTREAM 487 -#define VAR_FALLBACK_ENABLED 488 +#define VAR_ROOT_KEY_SENTINEL 461 +#define VAR_DNSCRYPT 462 +#define VAR_DNSCRYPT_ENABLE 463 +#define VAR_DNSCRYPT_PORT 464 +#define VAR_DNSCRYPT_PROVIDER 465 +#define VAR_DNSCRYPT_SECRET_KEY 466 +#define VAR_DNSCRYPT_PROVIDER_CERT 467 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 468 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 469 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 470 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 471 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 472 +#define VAR_IPSECMOD_ENABLED 473 +#define VAR_IPSECMOD_HOOK 474 +#define VAR_IPSECMOD_IGNORE_BOGUS 475 +#define VAR_IPSECMOD_MAX_TTL 476 +#define VAR_IPSECMOD_WHITELIST 477 +#define VAR_IPSECMOD_STRICT 478 +#define VAR_CACHEDB 479 +#define VAR_CACHEDB_BACKEND 480 +#define VAR_CACHEDB_SECRETSEED 481 +#define VAR_CACHEDB_REDISHOST 482 +#define VAR_CACHEDB_REDISPORT 483 +#define VAR_CACHEDB_REDISTIMEOUT 484 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 485 +#define VAR_FOR_UPSTREAM 486 +#define VAR_AUTH_ZONE 487 +#define VAR_ZONEFILE 488 +#define VAR_MASTER 489 +#define VAR_URL 490 +#define VAR_FOR_DOWNSTREAM 491 +#define VAR_FALLBACK_ENABLED 492 +#define VAR_ADDITIONAL_TLS_PORT 493 +#define VAR_LOW_RTT 494 +#define VAR_LOW_RTT_PCT 495 +#define VAR_ALLOW_NOTIFY 496 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -601,7 +617,7 @@ union YYSTYPE char* str; -#line 605 "util/configparser.c" /* yacc.c:355 */ +#line 621 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -618,7 +634,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 622 "util/configparser.c" /* yacc.c:358 */ +#line 638 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -860,21 +876,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 473 +#define YYLAST 489 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 234 +#define YYNTOKENS 242 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 254 +#define YYNNTS 262 /* YYNRULES -- Number of rules. */ -#define YYNRULES 485 +#define YYNRULES 501 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 726 +#define YYNSTATES 750 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 488 +#define YYMAXUTOK 496 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -931,62 +947,65 @@ static const yytype_uint8 yytranslate[] = 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 + 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, + 235, 236, 237, 238, 239, 240, 241 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 160, 160, 160, 161, 161, 162, 162, 163, 163, - 163, 164, 164, 165, 169, 174, 175, 176, 176, 176, - 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, - 181, 182, 182, 182, 183, 183, 184, 184, 185, 185, - 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, - 191, 191, 191, 192, 192, 192, 193, 193, 193, 194, - 194, 195, 195, 196, 196, 197, 197, 198, 198, 198, - 199, 199, 200, 200, 201, 201, 201, 202, 202, 203, - 203, 204, 204, 205, 205, 205, 206, 206, 207, 207, - 208, 208, 209, 209, 210, 210, 211, 211, 211, 212, - 212, 213, 213, 213, 214, 214, 214, 215, 215, 215, - 216, 216, 216, 216, 217, 217, 217, 218, 218, 218, - 219, 219, 220, 220, 221, 221, 222, 222, 223, 223, - 223, 224, 224, 225, 225, 226, 227, 227, 228, 228, - 229, 229, 230, 231, 231, 232, 232, 233, 233, 234, - 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, - 239, 239, 239, 240, 240, 240, 241, 241, 241, 242, - 242, 243, 243, 244, 244, 245, 245, 246, 246, 247, - 249, 261, 262, 263, 263, 263, 263, 263, 264, 266, - 278, 279, 280, 280, 280, 280, 281, 283, 297, 298, - 299, 299, 299, 299, 300, 300, 300, 302, 318, 319, - 320, 320, 320, 320, 321, 321, 321, 323, 332, 341, - 352, 361, 370, 379, 390, 399, 410, 423, 438, 449, - 466, 483, 496, 511, 520, 529, 538, 547, 556, 565, - 574, 583, 592, 601, 610, 619, 628, 637, 646, 655, - 662, 669, 678, 685, 694, 703, 717, 726, 735, 744, - 751, 758, 784, 792, 799, 806, 813, 820, 828, 836, - 844, 851, 862, 869, 878, 887, 896, 903, 910, 918, - 926, 936, 946, 956, 969, 980, 988, 1001, 1010, 1019, - 1028, 1038, 1048, 1056, 1069, 1078, 1086, 1095, 1103, 1116, - 1125, 1132, 1142, 1152, 1162, 1172, 1182, 1192, 1202, 1212, - 1219, 1226, 1233, 1242, 1251, 1260, 1267, 1277, 1294, 1301, - 1319, 1332, 1345, 1354, 1363, 1372, 1381, 1391, 1401, 1412, - 1421, 1430, 1443, 1456, 1465, 1472, 1481, 1490, 1499, 1508, - 1516, 1529, 1537, 1566, 1573, 1588, 1598, 1608, 1615, 1622, - 1631, 1645, 1664, 1683, 1695, 1707, 1719, 1730, 1749, 1759, - 1768, 1776, 1784, 1797, 1810, 1823, 1836, 1845, 1854, 1864, - 1874, 1887, 1900, 1911, 1924, 1935, 1948, 1958, 1965, 1972, - 1981, 1991, 2001, 2011, 2018, 2025, 2034, 2044, 2054, 2061, - 2068, 2075, 2085, 2095, 2105, 2115, 2145, 2155, 2163, 2172, - 2187, 2196, 2201, 2202, 2203, 2203, 2203, 2204, 2204, 2204, - 2205, 2205, 2207, 2217, 2226, 2233, 2243, 2250, 2257, 2264, - 2271, 2276, 2277, 2278, 2278, 2279, 2279, 2280, 2280, 2281, - 2282, 2283, 2284, 2285, 2286, 2288, 2296, 2303, 2311, 2319, - 2326, 2333, 2342, 2351, 2360, 2369, 2378, 2387, 2392, 2393, - 2394, 2396, 2402, 2412, 2419, 2428, 2436, 2442, 2443, 2445, - 2445, 2445, 2446, 2446, 2447, 2448, 2449, 2450, 2451, 2453, - 2463, 2473, 2480, 2489, 2496, 2505, 2513, 2526, 2534, 2547, - 2552, 2553, 2554, 2554, 2556, 2570 + 0, 163, 163, 163, 164, 164, 165, 165, 166, 166, + 166, 167, 167, 168, 172, 177, 178, 179, 179, 179, + 180, 180, 181, 181, 182, 182, 183, 183, 184, 184, + 184, 185, 185, 185, 186, 186, 187, 187, 188, 188, + 189, 189, 190, 190, 191, 191, 192, 192, 193, 193, + 194, 194, 194, 195, 195, 195, 196, 196, 196, 197, + 197, 198, 198, 199, 199, 200, 200, 201, 201, 201, + 202, 202, 203, 203, 204, 204, 204, 205, 205, 206, + 206, 207, 207, 208, 208, 208, 209, 209, 210, 210, + 211, 211, 212, 212, 213, 213, 214, 214, 214, 215, + 215, 216, 216, 216, 217, 217, 217, 218, 218, 218, + 219, 219, 219, 219, 220, 220, 220, 221, 221, 221, + 222, 222, 223, 223, 224, 224, 225, 225, 226, 226, + 226, 227, 227, 228, 228, 229, 230, 230, 231, 231, + 232, 232, 233, 234, 234, 235, 235, 236, 236, 237, + 237, 237, 238, 238, 239, 239, 240, 240, 241, 241, + 242, 242, 242, 243, 243, 243, 244, 244, 244, 245, + 245, 246, 247, 247, 248, 248, 249, 249, 250, 250, + 251, 251, 251, 252, 254, 266, 267, 268, 268, 268, + 268, 268, 269, 271, 283, 284, 285, 285, 285, 285, + 286, 288, 302, 303, 304, 304, 304, 304, 305, 305, + 305, 307, 323, 324, 325, 325, 325, 325, 326, 326, + 326, 327, 329, 338, 347, 358, 367, 376, 385, 396, + 405, 416, 429, 444, 455, 472, 489, 502, 517, 526, + 535, 544, 553, 562, 571, 580, 589, 598, 607, 616, + 625, 634, 643, 652, 661, 668, 675, 684, 691, 699, + 708, 717, 731, 740, 749, 758, 765, 772, 798, 806, + 813, 820, 827, 834, 842, 850, 858, 865, 876, 887, + 894, 903, 912, 921, 928, 935, 943, 951, 961, 971, + 981, 994, 1005, 1013, 1026, 1035, 1044, 1053, 1063, 1073, + 1081, 1094, 1103, 1111, 1120, 1128, 1141, 1150, 1157, 1167, + 1177, 1187, 1197, 1207, 1217, 1227, 1237, 1244, 1251, 1258, + 1267, 1276, 1285, 1292, 1302, 1319, 1326, 1344, 1357, 1370, + 1379, 1388, 1397, 1406, 1416, 1426, 1437, 1446, 1455, 1468, + 1481, 1490, 1497, 1506, 1515, 1524, 1533, 1541, 1554, 1562, + 1591, 1598, 1613, 1623, 1633, 1640, 1647, 1656, 1670, 1689, + 1708, 1720, 1732, 1744, 1755, 1774, 1784, 1793, 1801, 1809, + 1822, 1835, 1848, 1861, 1870, 1879, 1888, 1897, 1907, 1917, + 1930, 1943, 1954, 1967, 1978, 1991, 2001, 2008, 2015, 2024, + 2034, 2044, 2054, 2061, 2068, 2077, 2087, 2097, 2104, 2111, + 2118, 2126, 2136, 2146, 2156, 2166, 2196, 2206, 2214, 2223, + 2238, 2247, 2252, 2253, 2254, 2254, 2254, 2255, 2255, 2255, + 2256, 2256, 2258, 2268, 2277, 2284, 2294, 2301, 2308, 2315, + 2322, 2327, 2328, 2329, 2329, 2330, 2330, 2331, 2331, 2332, + 2333, 2334, 2335, 2336, 2337, 2339, 2347, 2354, 2362, 2370, + 2377, 2384, 2393, 2402, 2411, 2420, 2429, 2438, 2443, 2444, + 2445, 2447, 2453, 2463, 2470, 2479, 2487, 2493, 2494, 2496, + 2496, 2496, 2497, 2497, 2498, 2499, 2500, 2501, 2502, 2504, + 2514, 2524, 2531, 2540, 2547, 2556, 2564, 2577, 2585, 2598, + 2603, 2604, 2605, 2605, 2606, 2606, 2606, 2608, 2622, 2637, + 2649, 2664 }; #endif @@ -1068,23 +1087,27 @@ static const char *const yytname[] = "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_FAKE_SHA1", "VAR_LOG_IDENTITY", "VAR_HIDE_TRUSTANCHOR", "VAR_TRUST_ANCHOR_SIGNALING", "VAR_AGGRESSIVE_NSEC", "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", - "VAR_SHM_KEY", "VAR_DNSCRYPT", "VAR_DNSCRYPT_ENABLE", - "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", "VAR_DNSCRYPT_SECRET_KEY", - "VAR_DNSCRYPT_PROVIDER_CERT", "VAR_DNSCRYPT_PROVIDER_CERT_ROTATED", + "VAR_SHM_KEY", "VAR_ROOT_KEY_SENTINEL", "VAR_DNSCRYPT", + "VAR_DNSCRYPT_ENABLE", "VAR_DNSCRYPT_PORT", "VAR_DNSCRYPT_PROVIDER", + "VAR_DNSCRYPT_SECRET_KEY", "VAR_DNSCRYPT_PROVIDER_CERT", + "VAR_DNSCRYPT_PROVIDER_CERT_ROTATED", "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE", "VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS", "VAR_DNSCRYPT_NONCE_CACHE_SIZE", "VAR_DNSCRYPT_NONCE_CACHE_SLABS", "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS", "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT", "VAR_CACHEDB", "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED", - "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "VAR_FOR_UPSTREAM", - "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER", "VAR_URL", - "VAR_FOR_DOWNSTREAM", "VAR_FALLBACK_ENABLED", "$accept", "toplevelvars", - "toplevelvar", "serverstart", "contents_server", "content_server", - "stubstart", "contents_stub", "content_stub", "forwardstart", - "contents_forward", "content_forward", "viewstart", "contents_view", - "content_view", "authstart", "contents_auth", "content_auth", - "server_num_threads", "server_verbosity", "server_statistics_interval", + "VAR_CACHEDB_REDISHOST", "VAR_CACHEDB_REDISPORT", + "VAR_CACHEDB_REDISTIMEOUT", "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", + "VAR_FOR_UPSTREAM", "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER", + "VAR_URL", "VAR_FOR_DOWNSTREAM", "VAR_FALLBACK_ENABLED", + "VAR_ADDITIONAL_TLS_PORT", "VAR_LOW_RTT", "VAR_LOW_RTT_PCT", + "VAR_ALLOW_NOTIFY", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "viewstart", "contents_view", "content_view", + "authstart", "contents_auth", "content_auth", "server_num_threads", + "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", "server_send_client_subnet", "server_client_subnet_zone", @@ -1098,14 +1121,15 @@ static const char *const yytname[] = "server_outgoing_tcp_mss", "server_tcp_upstream", "server_udp_upstream_without_downstream", "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", - "server_tls_cert_bundle", "server_use_systemd", "server_do_daemonize", - "server_use_syslog", "server_log_time_ascii", "server_log_queries", - "server_log_replies", "server_chroot", "server_username", - "server_directory", "server_logfile", "server_pidfile", - "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", - "server_auto_trust_anchor_file", "server_trust_anchor_file", - "server_trusted_keys_file", "server_trust_anchor", - "server_trust_anchor_signaling", "server_domain_insecure", + "server_tls_cert_bundle", "server_additional_tls_port", + "server_use_systemd", "server_do_daemonize", "server_use_syslog", + "server_log_time_ascii", "server_log_queries", "server_log_replies", + "server_chroot", "server_username", "server_directory", "server_logfile", + "server_pidfile", "server_root_hints", "server_dlv_anchor_file", + "server_dlv_anchor", "server_auto_trust_anchor_file", + "server_trust_anchor_file", "server_trusted_keys_file", + "server_trust_anchor", "server_trust_anchor_signaling", + "server_root_key_sentinel", "server_domain_insecure", "server_hide_identity", "server_hide_version", "server_hide_trustanchor", "server_identity", "server_version", "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent", @@ -1148,24 +1172,24 @@ static const char *const yytname[] = "server_ratelimit_size", "server_ip_ratelimit_slabs", "server_ratelimit_slabs", "server_ratelimit_for_domain", "server_ratelimit_below_domain", "server_ip_ratelimit_factor", - "server_ratelimit_factor", "server_qname_minimisation", - "server_qname_minimisation_strict", "server_ipsecmod_enabled", - "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook", - "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist", - "server_ipsecmod_strict", "stub_name", "stub_host", "stub_addr", - "stub_first", "stub_ssl_upstream", "stub_prime", "forward_name", - "forward_host", "forward_addr", "forward_first", "forward_ssl_upstream", - "auth_name", "auth_zonefile", "auth_master", "auth_url", - "auth_for_downstream", "auth_for_upstream", "auth_fallback_enabled", - "view_name", "view_local_zone", "view_response_ip", - "view_response_ip_data", "view_local_data", "view_local_data_ptr", - "view_first", "rcstart", "contents_rc", "content_rc", - "rc_control_enable", "rc_control_port", "rc_control_interface", - "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file", - "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt", - "content_dt", "dt_dnstap_enable", "dt_dnstap_socket_path", - "dt_dnstap_send_identity", "dt_dnstap_send_version", - "dt_dnstap_identity", "dt_dnstap_version", + "server_ratelimit_factor", "server_low_rtt", "server_low_rtt_pct", + "server_qname_minimisation", "server_qname_minimisation_strict", + "server_ipsecmod_enabled", "server_ipsecmod_ignore_bogus", + "server_ipsecmod_hook", "server_ipsecmod_max_ttl", + "server_ipsecmod_whitelist", "server_ipsecmod_strict", "stub_name", + "stub_host", "stub_addr", "stub_first", "stub_ssl_upstream", + "stub_prime", "forward_name", "forward_host", "forward_addr", + "forward_first", "forward_ssl_upstream", "auth_name", "auth_zonefile", + "auth_master", "auth_url", "auth_allow_notify", "auth_for_downstream", + "auth_for_upstream", "auth_fallback_enabled", "view_name", + "view_local_zone", "view_response_ip", "view_response_ip_data", + "view_local_data", "view_local_data_ptr", "view_first", "rcstart", + "contents_rc", "content_rc", "rc_control_enable", "rc_control_port", + "rc_control_interface", "rc_control_use_cert", "rc_server_key_file", + "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file", + "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable", + "dt_dnstap_socket_path", "dt_dnstap_send_identity", + "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version", "dt_dnstap_log_resolver_query_messages", "dt_dnstap_log_resolver_response_messages", "dt_dnstap_log_client_query_messages", @@ -1182,7 +1206,8 @@ static const char *const yytname[] = "dnsc_dnscrypt_shared_secret_cache_slabs", "dnsc_dnscrypt_nonce_cache_size", "dnsc_dnscrypt_nonce_cache_slabs", "cachedbstart", "contents_cachedb", "content_cachedb", - "cachedb_backend_name", "cachedb_secret_seed", YY_NULLPTR + "cachedb_backend_name", "cachedb_secret_seed", "redis_server_host", + "redis_server_port", "redis_timeout", YY_NULLPTR }; #endif @@ -1214,14 +1239,15 @@ static const yytype_uint16 yytoknum[] = 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, - 485, 486, 487, 488 + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, + 495, 496 }; # endif -#define YYPACT_NINF -223 +#define YYPACT_NINF -184 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-223))) + (!!((Yystate) == (-184))) #define YYTABLE_NINF -1 @@ -1232,79 +1258,81 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -223, 0, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, 217, -36, -31, -39, -35, -24, - -128, -100, -159, -222, 2, 3, 4, 5, 6, 21, - 22, 23, 24, 25, 26, 29, 30, 32, 33, 34, - 35, 36, 48, 49, 50, 51, 53, 54, 55, 56, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 82, 83, 84, 85, 86, - 88, 89, 92, 94, 95, 96, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, - 176, 177, 178, 179, 180, 181, 189, 190, 191, 192, - 193, 194, 195, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 214, - 215, 216, 247, 248, 249, 250, 254, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, 255, 256, 298, 299, 300, 301, -223, -223, -223, - -223, -223, -223, -223, 302, 303, 304, 305, 306, -223, - -223, -223, -223, -223, -223, 310, 314, 315, 339, 340, - 341, 343, -223, -223, -223, -223, -223, -223, -223, -223, - 353, 354, 355, 356, 357, 358, 359, -223, -223, -223, - -223, -223, -223, -223, -223, 360, 361, 362, 363, 364, - 365, 400, 402, -223, -223, -223, -223, -223, -223, -223, - -223, -223, 413, 414, 415, 416, 417, 418, 419, 420, - 421, 422, 423, 430, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, 431, -223, -223, - 432, 434, 435, 436, 437, 438, 439, 440, 441, 442, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, 443, 444, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, 445, 446, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, 447, 448, 449, - -223, -223, -223, -223, -223, -223, -223, -223, -223, 450, - 451, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, 452, 453, 454, 455, - 456, 457, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, 458, -223, -223, 459, 460, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, 461, 462, 463, -223, - -223, -223, -223, -223, -223, -223 + -184, 0, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, 221, -37, -32, -38, -39, -62, + -129, -104, -160, -183, -3, -1, 2, 3, 4, 5, + 30, 48, 49, 50, 51, 52, 54, 55, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 82, 83, 84, 85, 87, 88, 91, 93, + 94, 95, 96, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 189, 190, 191, 193, 194, 195, 196, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, + 219, 220, 251, 252, 253, 254, 258, 259, 260, 302, + 303, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, 304, + 305, 306, 307, 308, 309, -184, -184, -184, -184, -184, + -184, -184, 310, 314, 318, 319, 343, -184, -184, -184, + -184, -184, -184, 344, 345, 347, 357, 358, 359, 360, + -184, -184, -184, -184, -184, -184, -184, -184, 361, 362, + 363, 364, 365, 366, 367, 368, -184, -184, -184, -184, + -184, -184, -184, -184, -184, 369, 404, 406, 418, 419, + 420, 421, 422, -184, -184, -184, -184, -184, -184, -184, + -184, -184, 423, 424, 425, 426, 427, 428, 435, 436, + 437, 438, 439, 440, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, 442, -184, -184, + 443, 444, 445, 446, 447, 448, 452, 453, 454, 455, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, 456, 457, 458, 459, 460, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, 461, 462, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, 463, 464, 465, -184, -184, -184, -184, + -184, -184, -184, -184, -184, 466, 467, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, 468, 469, 470, 471, 472, 473, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, 474, -184, -184, 475, 476, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + 477, 478, 479, -184, -184, -184, -184, -184, -184, -184 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1312,9 +1340,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 14, 180, 189, 401, 447, 420, 197, - 456, 479, 207, 3, 16, 182, 191, 199, 209, 403, - 422, 449, 458, 481, 4, 5, 6, 10, 13, 8, + 2, 0, 1, 14, 184, 193, 411, 457, 430, 201, + 466, 489, 211, 3, 16, 186, 195, 203, 213, 413, + 432, 459, 468, 491, 4, 5, 6, 10, 13, 8, 9, 7, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1331,122 +1359,126 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 15, 17, 18, - 77, 80, 89, 166, 167, 19, 139, 140, 141, 142, - 143, 144, 28, 68, 20, 81, 82, 39, 61, 76, - 21, 22, 24, 25, 23, 26, 27, 112, 177, 113, - 114, 115, 116, 179, 162, 78, 67, 93, 110, 111, - 29, 30, 31, 32, 33, 69, 83, 84, 99, 55, - 65, 56, 170, 94, 49, 50, 169, 51, 52, 103, - 107, 120, 128, 149, 104, 62, 34, 35, 36, 91, - 121, 122, 123, 37, 38, 40, 41, 43, 44, 42, - 126, 45, 46, 47, 53, 72, 108, 86, 127, 79, - 145, 87, 88, 105, 106, 92, 48, 70, 73, 54, - 57, 95, 96, 71, 146, 97, 58, 59, 60, 178, - 109, 159, 160, 168, 98, 66, 100, 101, 102, 147, - 63, 64, 85, 74, 75, 90, 117, 118, 119, 124, - 125, 150, 151, 153, 155, 156, 154, 157, 163, 129, - 130, 133, 134, 131, 132, 135, 136, 138, 137, 148, - 158, 171, 173, 172, 174, 175, 176, 152, 161, 164, - 165, 0, 0, 0, 0, 0, 0, 181, 183, 184, - 185, 187, 188, 186, 0, 0, 0, 0, 0, 190, - 192, 193, 194, 195, 196, 0, 0, 0, 0, 0, - 0, 0, 198, 200, 201, 204, 205, 202, 206, 203, - 0, 0, 0, 0, 0, 0, 0, 208, 210, 211, - 212, 213, 214, 215, 216, 0, 0, 0, 0, 0, - 0, 0, 0, 402, 404, 406, 405, 411, 407, 408, - 409, 410, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 421, 423, 424, 425, 426, 427, - 428, 429, 430, 431, 432, 433, 434, 0, 448, 450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 457, 459, 460, 461, 463, 464, 462, 465, 466, 467, - 468, 0, 0, 480, 482, 483, 218, 217, 224, 233, - 231, 239, 240, 243, 241, 242, 244, 245, 259, 260, - 261, 262, 263, 285, 286, 287, 292, 293, 236, 294, - 295, 298, 296, 297, 300, 301, 302, 315, 273, 274, - 276, 277, 303, 318, 268, 270, 319, 325, 326, 327, - 237, 284, 339, 340, 269, 334, 255, 232, 264, 316, - 322, 304, 0, 0, 343, 238, 219, 254, 308, 220, - 234, 235, 265, 266, 341, 306, 310, 311, 221, 344, - 288, 314, 256, 272, 320, 321, 324, 333, 267, 337, - 335, 336, 278, 283, 312, 313, 279, 280, 305, 329, - 257, 258, 246, 248, 249, 250, 251, 252, 345, 346, - 347, 289, 290, 291, 299, 348, 349, 0, 0, 0, - 307, 281, 452, 358, 362, 360, 359, 363, 361, 0, - 0, 366, 367, 225, 226, 227, 228, 229, 230, 309, - 323, 338, 368, 369, 282, 350, 0, 0, 0, 0, - 0, 0, 330, 331, 332, 453, 275, 271, 328, 253, - 222, 223, 370, 372, 371, 373, 374, 375, 247, 376, - 377, 378, 381, 380, 379, 382, 383, 384, 385, 386, - 394, 0, 398, 399, 0, 0, 400, 387, 392, 388, - 389, 390, 391, 393, 412, 414, 413, 416, 417, 418, - 419, 415, 435, 436, 437, 438, 439, 440, 441, 442, - 443, 444, 445, 446, 451, 469, 470, 471, 474, 472, - 473, 475, 476, 477, 478, 484, 485, 317, 342, 357, - 454, 455, 364, 365, 351, 352, 0, 0, 0, 356, - 395, 396, 397, 355, 353, 354 + 0, 15, 17, 18, 77, 80, 89, 166, 167, 19, + 139, 140, 141, 142, 143, 144, 28, 68, 20, 81, + 82, 39, 61, 76, 21, 22, 24, 25, 23, 26, + 27, 112, 178, 113, 114, 115, 116, 180, 181, 162, + 78, 67, 93, 110, 111, 29, 30, 31, 32, 33, + 69, 83, 84, 99, 55, 65, 56, 170, 171, 94, + 49, 50, 169, 51, 52, 103, 107, 120, 128, 149, + 104, 62, 34, 35, 36, 91, 121, 122, 123, 37, + 38, 40, 41, 43, 44, 42, 126, 45, 46, 47, + 53, 72, 108, 86, 127, 79, 145, 87, 88, 105, + 106, 92, 48, 70, 73, 54, 57, 95, 96, 71, + 146, 97, 58, 59, 60, 179, 109, 159, 160, 168, + 98, 66, 100, 101, 102, 147, 63, 64, 85, 74, + 75, 90, 117, 118, 119, 124, 125, 150, 151, 153, + 155, 156, 154, 157, 163, 129, 130, 133, 134, 131, + 132, 135, 136, 138, 137, 182, 183, 148, 158, 172, + 174, 173, 175, 176, 177, 152, 161, 164, 165, 0, + 0, 0, 0, 0, 0, 185, 187, 188, 189, 191, + 192, 190, 0, 0, 0, 0, 0, 194, 196, 197, + 198, 199, 200, 0, 0, 0, 0, 0, 0, 0, + 202, 204, 205, 208, 209, 206, 210, 207, 0, 0, + 0, 0, 0, 0, 0, 0, 212, 214, 215, 216, + 217, 221, 218, 219, 220, 0, 0, 0, 0, 0, + 0, 0, 0, 412, 414, 416, 415, 421, 417, 418, + 419, 420, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 431, 433, 434, 435, 436, 437, + 438, 439, 440, 441, 442, 443, 444, 0, 458, 460, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 467, 469, 470, 471, 473, 474, 472, 475, 476, 477, + 478, 0, 0, 0, 0, 0, 490, 492, 493, 494, + 495, 496, 223, 222, 229, 238, 236, 244, 245, 248, + 246, 247, 249, 250, 265, 266, 267, 268, 269, 292, + 293, 294, 299, 300, 241, 301, 302, 305, 303, 304, + 307, 308, 309, 322, 280, 281, 283, 284, 310, 325, + 274, 276, 326, 332, 333, 334, 242, 291, 346, 347, + 275, 341, 261, 237, 270, 323, 329, 311, 0, 0, + 350, 243, 224, 260, 315, 225, 239, 240, 271, 272, + 348, 313, 317, 318, 226, 351, 295, 321, 262, 279, + 327, 328, 331, 340, 273, 344, 342, 343, 285, 290, + 319, 320, 286, 287, 312, 336, 263, 264, 251, 253, + 254, 255, 256, 257, 352, 353, 354, 296, 297, 298, + 306, 355, 356, 0, 0, 0, 314, 288, 462, 365, + 369, 367, 366, 370, 368, 0, 0, 373, 374, 230, + 231, 232, 233, 234, 235, 316, 330, 345, 377, 378, + 289, 357, 0, 0, 0, 0, 0, 0, 337, 338, + 339, 463, 282, 277, 335, 259, 227, 228, 278, 379, + 381, 380, 382, 383, 384, 252, 258, 375, 376, 385, + 386, 387, 390, 389, 388, 391, 392, 393, 394, 395, + 404, 0, 408, 409, 0, 0, 410, 396, 402, 397, + 398, 399, 401, 403, 400, 422, 424, 423, 426, 427, + 428, 429, 425, 445, 446, 447, 448, 449, 450, 451, + 452, 453, 454, 455, 456, 461, 479, 480, 481, 484, + 482, 483, 485, 486, 487, 488, 497, 498, 499, 500, + 501, 324, 349, 364, 464, 465, 371, 372, 358, 359, + 0, 0, 0, 363, 405, 406, 407, 362, 360, 361 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223 + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 13, 14, 24, 197, 15, 25, 367, 16, - 26, 379, 17, 27, 392, 18, 28, 407, 198, 199, - 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, - 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, - 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, - 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, - 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, - 350, 351, 352, 353, 354, 355, 356, 368, 369, 370, - 371, 372, 373, 380, 381, 382, 383, 384, 408, 409, - 410, 411, 412, 413, 414, 393, 394, 395, 396, 397, - 398, 399, 19, 29, 423, 424, 425, 426, 427, 428, - 429, 430, 431, 20, 30, 444, 445, 446, 447, 448, - 449, 450, 451, 452, 453, 454, 455, 456, 21, 31, - 458, 459, 357, 358, 359, 360, 22, 32, 470, 471, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 23, - 33, 483, 484, 485 + -1, 1, 13, 14, 24, 201, 15, 25, 375, 16, + 26, 387, 17, 27, 400, 18, 28, 416, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, + 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, + 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, + 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, + 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, + 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, + 364, 376, 377, 378, 379, 380, 381, 388, 389, 390, + 391, 392, 417, 418, 419, 420, 421, 422, 423, 424, + 401, 402, 403, 404, 405, 406, 407, 19, 29, 433, + 434, 435, 436, 437, 438, 439, 440, 441, 20, 30, + 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, + 464, 465, 466, 21, 31, 468, 469, 365, 366, 367, + 368, 22, 32, 480, 481, 482, 483, 484, 485, 486, + 487, 488, 489, 490, 23, 33, 496, 497, 498, 499, + 500, 501 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1454,116 +1486,118 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 385, 481, 482, 361, 400, 362, 363, 457, 374, - 0, 3, 486, 487, 488, 489, 490, 375, 376, 432, - 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, - 443, 491, 492, 493, 494, 495, 496, 386, 387, 497, - 498, 4, 499, 500, 501, 502, 503, 5, 460, 461, - 462, 463, 464, 465, 466, 467, 468, 469, 504, 505, - 506, 507, 388, 508, 509, 510, 511, 364, 415, 416, - 417, 418, 419, 420, 421, 422, 512, 513, 514, 515, - 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, - 526, 6, 527, 528, 529, 530, 531, 365, 532, 533, - 366, 377, 534, 378, 535, 536, 537, 7, 538, 539, - 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, - 550, 389, 390, 551, 552, 553, 554, 555, 556, 557, - 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, - 568, 569, 570, 571, 572, 573, 8, 574, 575, 576, - 577, 578, 579, 580, 581, 582, 391, 583, 584, 585, - 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, - 596, 597, 598, 599, 600, 601, 602, 603, 604, 605, - 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, - 616, 617, 401, 9, 402, 403, 404, 405, 406, 618, - 619, 620, 621, 622, 623, 624, 10, 625, 626, 627, - 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, - 638, 639, 640, 11, 641, 642, 643, 0, 12, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 644, 645, 646, - 647, 62, 63, 64, 648, 649, 650, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 651, 652, - 653, 654, 655, 656, 657, 658, 659, 106, 107, 108, - 660, 109, 110, 111, 661, 662, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 663, - 664, 665, 135, 666, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 667, 668, 669, 670, 671, 672, 673, - 674, 675, 676, 677, 678, 679, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 680, 179, 681, 180, 181, 182, 183, 184, 185, 186, - 187, 188, 189, 682, 683, 684, 685, 686, 687, 688, - 689, 690, 691, 692, 190, 191, 192, 193, 194, 195, - 693, 694, 695, 196, 696, 697, 698, 699, 700, 701, - 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, - 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, - 722, 723, 724, 725 + 2, 408, 393, 369, 467, 370, 371, 502, 382, 503, + 0, 3, 504, 505, 506, 507, 383, 384, 442, 443, + 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, + 425, 426, 427, 428, 429, 430, 431, 432, 394, 395, + 508, 4, 491, 492, 493, 494, 495, 5, 470, 471, + 472, 473, 474, 475, 476, 477, 478, 479, 509, 510, + 511, 512, 513, 396, 514, 515, 372, 516, 517, 518, + 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, + 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, + 539, 6, 540, 541, 542, 543, 373, 544, 545, 374, + 385, 546, 386, 547, 548, 549, 550, 7, 551, 552, + 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, + 563, 564, 397, 398, 565, 566, 567, 568, 569, 570, + 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, + 581, 582, 583, 584, 585, 586, 8, 587, 588, 589, + 590, 591, 592, 593, 594, 595, 596, 399, 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, 409, 9, 410, 411, 412, 413, 414, 631, + 632, 633, 415, 634, 635, 636, 637, 10, 638, 639, + 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, + 650, 651, 652, 653, 11, 654, 655, 656, 657, 658, + 659, 0, 12, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 660, 661, 662, 663, 62, 63, 64, 664, 665, + 666, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 667, 668, 669, 670, 671, 672, 673, 674, + 675, 106, 107, 108, 676, 109, 110, 111, 677, 678, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 679, 680, 681, 135, 682, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 683, 684, 685, + 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 696, 179, 697, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 698, 699, + 700, 701, 702, 703, 704, 705, 706, 707, 708, 191, + 192, 193, 194, 195, 196, 709, 710, 711, 712, 713, + 714, 197, 715, 716, 717, 718, 719, 720, 721, 198, + 199, 200, 722, 723, 724, 725, 726, 727, 728, 729, + 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, + 740, 741, 742, 743, 744, 745, 746, 747, 748, 749 }; static const yytype_int16 yycheck[] = { - 0, 40, 224, 225, 40, 40, 42, 43, 108, 40, - -1, 11, 10, 10, 10, 10, 10, 48, 49, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 10, 10, 10, 10, 10, 10, 76, 77, 10, - 10, 41, 10, 10, 10, 10, 10, 47, 207, 208, - 209, 210, 211, 212, 213, 214, 215, 216, 10, 10, - 10, 10, 101, 10, 10, 10, 10, 103, 92, 93, - 94, 95, 96, 97, 98, 99, 10, 10, 10, 10, + 0, 40, 40, 40, 108, 42, 43, 10, 40, 10, + -1, 11, 10, 10, 10, 10, 48, 49, 147, 148, + 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, + 92, 93, 94, 95, 96, 97, 98, 99, 76, 77, + 10, 41, 225, 226, 227, 228, 229, 47, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 10, 10, + 10, 10, 10, 101, 10, 10, 103, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 10, 10, 10, 133, 10, 10, - 136, 132, 10, 134, 10, 10, 10, 107, 10, 10, + 10, 91, 10, 10, 10, 10, 133, 10, 10, 136, + 132, 10, 134, 10, 10, 10, 10, 107, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 160, 161, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 160, 161, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 146, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 195, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 195, 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, 227, 193, 229, 230, 231, 232, 233, 10, - 10, 10, 10, 10, 10, 10, 206, 10, 10, 10, + 10, 10, 231, 193, 233, 234, 235, 236, 237, 10, + 10, 10, 241, 10, 10, 10, 10, 207, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 223, 10, 10, 10, -1, 228, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 10, 10, 10, - 10, 44, 45, 46, 10, 10, 10, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 100, 101, 102, - 10, 104, 105, 106, 10, 10, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 10, - 10, 10, 135, 10, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 10, 194, 10, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 217, 218, 219, 220, 221, 222, - 10, 10, 10, 226, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 224, 10, 10, 10, 10, 10, + 10, -1, 232, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 10, 10, 10, 10, 44, 45, 46, 10, 10, + 10, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 100, 101, 102, 10, 104, 105, 106, 10, 10, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 10, 10, 10, 135, 10, 137, 138, + 139, 140, 141, 142, 143, 144, 145, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 10, 194, 10, 196, 197, 198, + 199, 200, 201, 202, 203, 204, 205, 206, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 218, + 219, 220, 221, 222, 223, 10, 10, 10, 10, 10, + 10, 230, 10, 10, 10, 10, 10, 10, 10, 238, + 239, 240, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 235, 0, 11, 41, 47, 91, 107, 146, 193, - 206, 223, 228, 236, 237, 240, 243, 246, 249, 436, - 447, 462, 470, 483, 238, 241, 244, 247, 250, 437, - 448, 463, 471, 484, 12, 13, 14, 15, 16, 17, + 0, 243, 0, 11, 41, 47, 91, 107, 146, 193, + 207, 224, 232, 244, 245, 248, 251, 254, 257, 449, + 460, 475, 483, 496, 246, 249, 252, 255, 258, 450, + 461, 476, 484, 497, 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, @@ -1579,36 +1613,38 @@ static const yytype_uint16 yystos[] = 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 217, 218, 219, 220, 221, 222, 226, 239, 252, 253, - 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, - 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, - 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, - 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, - 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, - 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, - 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, - 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, - 404, 405, 406, 407, 408, 409, 410, 466, 467, 468, - 469, 40, 42, 43, 103, 133, 136, 242, 411, 412, - 413, 414, 415, 416, 40, 48, 49, 132, 134, 245, - 417, 418, 419, 420, 421, 40, 76, 77, 101, 160, - 161, 195, 248, 429, 430, 431, 432, 433, 434, 435, - 40, 227, 229, 230, 231, 232, 233, 251, 422, 423, - 424, 425, 426, 427, 428, 92, 93, 94, 95, 96, - 97, 98, 99, 438, 439, 440, 441, 442, 443, 444, - 445, 446, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 108, 464, 465, - 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 224, 225, 485, 486, 487, 10, 10, 10, 10, + 206, 218, 219, 220, 221, 222, 223, 230, 238, 239, + 240, 247, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, + 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, + 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, + 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, + 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, + 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, + 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 419, 420, 421, 422, 479, 480, 481, 482, 40, + 42, 43, 103, 133, 136, 250, 423, 424, 425, 426, + 427, 428, 40, 48, 49, 132, 134, 253, 429, 430, + 431, 432, 433, 40, 76, 77, 101, 160, 161, 195, + 256, 442, 443, 444, 445, 446, 447, 448, 40, 231, + 233, 234, 235, 236, 237, 241, 259, 434, 435, 436, + 437, 438, 439, 440, 441, 92, 93, 94, 95, 96, + 97, 98, 99, 451, 452, 453, 454, 455, 456, 457, + 458, 459, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 462, 463, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 473, 474, 108, 477, 478, + 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, + 495, 225, 226, 227, 228, 229, 498, 499, 500, 501, + 502, 503, 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, @@ -1632,61 +1668,63 @@ 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 234, 235, 235, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 237, 238, 238, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, - 240, 241, 241, 242, 242, 242, 242, 242, 242, 243, - 244, 244, 245, 245, 245, 245, 245, 246, 247, 247, - 248, 248, 248, 248, 248, 248, 248, 249, 250, 250, - 251, 251, 251, 251, 251, 251, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, - 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, - 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 437, 438, 438, 438, 438, 438, 438, - 438, 438, 439, 440, 441, 442, 443, 444, 445, 446, - 447, 448, 448, 449, 449, 449, 449, 449, 449, 449, - 449, 449, 449, 449, 449, 450, 451, 452, 453, 454, - 455, 456, 457, 458, 459, 460, 461, 462, 463, 463, - 464, 465, 466, 467, 468, 469, 470, 471, 471, 472, - 472, 472, 472, 472, 472, 472, 472, 472, 472, 473, - 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, - 484, 484, 485, 485, 486, 487 + 0, 242, 243, 243, 244, 244, 244, 244, 244, 244, + 244, 244, 244, 244, 245, 246, 246, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, + 247, 247, 247, 247, 248, 249, 249, 250, 250, 250, + 250, 250, 250, 251, 252, 252, 253, 253, 253, 253, + 253, 254, 255, 255, 256, 256, 256, 256, 256, 256, + 256, 257, 258, 258, 259, 259, 259, 259, 259, 259, + 259, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, + 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, + 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, + 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, + 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, + 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, + 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, + 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, + 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, + 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, + 448, 449, 450, 450, 451, 451, 451, 451, 451, 451, + 451, 451, 452, 453, 454, 455, 456, 457, 458, 459, + 460, 461, 461, 462, 462, 462, 462, 462, 462, 462, + 462, 462, 462, 462, 462, 463, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 473, 474, 475, 476, 476, + 477, 478, 479, 480, 481, 482, 483, 484, 484, 485, + 485, 485, 485, 485, 485, 485, 485, 485, 485, 486, + 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, + 497, 497, 498, 498, 498, 498, 498, 499, 500, 501, + 502, 503 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1710,11 +1748,11 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1723,12 +1761,13 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 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, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, + 4, 4, 4, 3, 3, 2, 2, 2, 2, 2, + 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 2, 2, @@ -1740,7 +1779,8 @@ static const yytype_uint8 yyr2[] = 1, 2, 2, 2, 3, 3, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 2, 2 + 2, 0, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2 }; @@ -2417,15 +2457,15 @@ yyreduce: switch (yyn) { case 14: -#line 170 "util/configparser.y" /* yacc.c:1646 */ +#line 173 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2425 "util/configparser.c" /* yacc.c:1646 */ +#line 2465 "util/configparser.c" /* yacc.c:1646 */ break; - case 180: -#line 250 "util/configparser.y" /* yacc.c:1646 */ + case 184: +#line 255 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2436,11 +2476,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2440 "util/configparser.c" /* yacc.c:1646 */ +#line 2480 "util/configparser.c" /* yacc.c:1646 */ break; - case 189: -#line 267 "util/configparser.y" /* yacc.c:1646 */ + case 193: +#line 272 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2451,11 +2491,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2455 "util/configparser.c" /* yacc.c:1646 */ +#line 2495 "util/configparser.c" /* yacc.c:1646 */ break; - case 197: -#line 284 "util/configparser.y" /* yacc.c:1646 */ + case 201: +#line 289 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2468,11 +2508,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2472 "util/configparser.c" /* yacc.c:1646 */ +#line 2512 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 303 "util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 308 "util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2487,11 +2527,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2491 "util/configparser.c" /* yacc.c:1646 */ +#line 2531 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 324 "util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 330 "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) @@ -2499,11 +2539,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2503 "util/configparser.c" /* yacc.c:1646 */ +#line 2543 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 333 "util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 339 "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) @@ -2511,11 +2551,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2515 "util/configparser.c" /* yacc.c:1646 */ +#line 2555 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 342 "util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 348 "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) @@ -2525,11 +2565,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2529 "util/configparser.c" /* yacc.c:1646 */ +#line 2569 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 353 "util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 359 "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) @@ -2537,11 +2577,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2541 "util/configparser.c" /* yacc.c:1646 */ +#line 2581 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 362 "util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 368 "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) @@ -2549,11 +2589,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2553 "util/configparser.c" /* yacc.c:1646 */ +#line 2593 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 371 "util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 377 "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) @@ -2561,11 +2601,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2565 "util/configparser.c" /* yacc.c:1646 */ +#line 2605 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 380 "util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 386 "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) @@ -2575,11 +2615,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2579 "util/configparser.c" /* yacc.c:1646 */ +#line 2619 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 391 "util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 397 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2587,11 +2627,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2591 "util/configparser.c" /* yacc.c:1646 */ +#line 2631 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 400 "util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 406 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2601,11 +2641,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2605 "util/configparser.c" /* yacc.c:1646 */ +#line 2645 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 411 "util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 417 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2616,11 +2656,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2620 "util/configparser.c" /* yacc.c:1646 */ +#line 2660 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 424 "util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 430 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2634,11 +2674,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2638 "util/configparser.c" /* yacc.c:1646 */ +#line 2678 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 439 "util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 445 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2648,11 +2688,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2652 "util/configparser.c" /* yacc.c:1646 */ +#line 2692 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 450 "util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 456 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2668,11 +2708,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2672 "util/configparser.c" /* yacc.c:1646 */ +#line 2712 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 467 "util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 473 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2688,11 +2728,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2692 "util/configparser.c" /* yacc.c:1646 */ +#line 2732 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 484 "util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 490 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2704,11 +2744,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2708 "util/configparser.c" /* yacc.c:1646 */ +#line 2748 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 497 "util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 503 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2722,11 +2762,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2726 "util/configparser.c" /* yacc.c:1646 */ +#line 2766 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 512 "util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 518 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2734,11 +2774,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2738 "util/configparser.c" /* yacc.c:1646 */ +#line 2778 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 521 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 527 "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, @@ -2746,11 +2786,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2750 "util/configparser.c" /* yacc.c:1646 */ +#line 2790 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 530 "util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 536 "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, @@ -2758,11 +2798,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2762 "util/configparser.c" /* yacc.c:1646 */ +#line 2802 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 539 "util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 545 "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) @@ -2770,11 +2810,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2774 "util/configparser.c" /* yacc.c:1646 */ +#line 2814 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 548 "util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 554 "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) @@ -2782,11 +2822,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2786 "util/configparser.c" /* yacc.c:1646 */ +#line 2826 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 557 "util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 563 "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) @@ -2794,11 +2834,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2798 "util/configparser.c" /* yacc.c:1646 */ +#line 2838 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 566 "util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 572 "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) @@ -2806,11 +2846,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2810 "util/configparser.c" /* yacc.c:1646 */ +#line 2850 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 575 "util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 581 "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) @@ -2818,11 +2858,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2822 "util/configparser.c" /* yacc.c:1646 */ +#line 2862 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 584 "util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 590 "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) @@ -2830,11 +2870,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2834 "util/configparser.c" /* yacc.c:1646 */ +#line 2874 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 593 "util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 599 "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) @@ -2842,11 +2882,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2846 "util/configparser.c" /* yacc.c:1646 */ +#line 2886 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 602 "util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 608 "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) @@ -2854,11 +2894,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2858 "util/configparser.c" /* yacc.c:1646 */ +#line 2898 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 611 "util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 617 "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) @@ -2866,11 +2906,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2870 "util/configparser.c" /* yacc.c:1646 */ +#line 2910 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 620 "util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 626 "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) @@ -2878,11 +2918,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2882 "util/configparser.c" /* yacc.c:1646 */ +#line 2922 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 629 "util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 635 "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) @@ -2890,11 +2930,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2894 "util/configparser.c" /* yacc.c:1646 */ +#line 2934 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 638 "util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 644 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2902,11 +2942,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2906 "util/configparser.c" /* yacc.c:1646 */ +#line 2946 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 647 "util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 653 "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) @@ -2914,31 +2954,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2918 "util/configparser.c" /* yacc.c:1646 */ +#line 2958 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 656 "util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 662 "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 2928 "util/configparser.c" /* yacc.c:1646 */ +#line 2968 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 663 "util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 669 "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 2938 "util/configparser.c" /* yacc.c:1646 */ +#line 2978 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 670 "util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 676 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2946,21 +2986,32 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2950 "util/configparser.c" /* yacc.c:1646 */ +#line 2990 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 679 "util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 685 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->tls_cert_bundle); cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str); } -#line 2960 "util/configparser.c" /* yacc.c:1646 */ +#line 3000 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 686 "util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 692 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_additional_tls_port:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->additional_tls_port, + (yyvsp[0].str))) + yyerror("out of memory"); + } +#line 3011 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 259: +#line 700 "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) @@ -2968,11 +3019,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2972 "util/configparser.c" /* yacc.c:1646 */ +#line 3023 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 695 "util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 709 "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) @@ -2980,11 +3031,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2984 "util/configparser.c" /* yacc.c:1646 */ +#line 3035 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 704 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 718 "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) @@ -2997,11 +3048,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3001 "util/configparser.c" /* yacc.c:1646 */ +#line 3052 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 718 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 732 "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) @@ -3009,11 +3060,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3013 "util/configparser.c" /* yacc.c:1646 */ +#line 3064 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 727 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 741 "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) @@ -3021,11 +3072,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3025 "util/configparser.c" /* yacc.c:1646 */ +#line 3076 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 736 "util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 750 "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) @@ -3033,31 +3084,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3037 "util/configparser.c" /* yacc.c:1646 */ +#line 3088 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 745 "util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 759 "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 3047 "util/configparser.c" /* yacc.c:1646 */ +#line 3098 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 752 "util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 766 "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 3057 "util/configparser.c" /* yacc.c:1646 */ +#line 3108 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 759 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 773 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3082,105 +3133,105 @@ yyreduce: } } } -#line 3086 "util/configparser.c" /* yacc.c:1646 */ +#line 3137 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 785 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 799 "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 3097 "util/configparser.c" /* yacc.c:1646 */ +#line 3148 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 793 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 807 "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 3107 "util/configparser.c" /* yacc.c:1646 */ +#line 3158 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 800 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 814 "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 3117 "util/configparser.c" /* yacc.c:1646 */ +#line 3168 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 807 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 821 "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 3127 "util/configparser.c" /* yacc.c:1646 */ +#line 3178 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 814 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 828 "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 3137 "util/configparser.c" /* yacc.c:1646 */ +#line 3188 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 821 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 835 "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 3148 "util/configparser.c" /* yacc.c:1646 */ +#line 3199 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 829 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 843 "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 3159 "util/configparser.c" /* yacc.c:1646 */ +#line 3210 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 837 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 851 "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 3170 "util/configparser.c" /* yacc.c:1646 */ +#line 3221 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 845 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 859 "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 3180 "util/configparser.c" /* yacc.c:1646 */ +#line 3231 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 852 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 866 "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) @@ -3190,21 +3241,35 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3194 "util/configparser.c" /* yacc.c:1646 */ +#line 3245 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 863 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 877 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_root_key_sentinel:%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->root_key_sentinel = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3259 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 279: +#line 888 "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 3204 "util/configparser.c" /* yacc.c:1646 */ +#line 3269 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 870 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 895 "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) @@ -3212,11 +3277,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3216 "util/configparser.c" /* yacc.c:1646 */ +#line 3281 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 879 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 904 "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) @@ -3224,11 +3289,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3228 "util/configparser.c" /* yacc.c:1646 */ +#line 3293 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 888 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 913 "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) @@ -3236,53 +3301,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3240 "util/configparser.c" /* yacc.c:1646 */ +#line 3305 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 897 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 922 "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 3250 "util/configparser.c" /* yacc.c:1646 */ +#line 3315 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 904 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 929 "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 3260 "util/configparser.c" /* yacc.c:1646 */ +#line 3325 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 911 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 936 "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 3271 "util/configparser.c" /* yacc.c:1646 */ +#line 3336 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 919 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 944 "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 3282 "util/configparser.c" /* yacc.c:1646 */ +#line 3347 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 927 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 952 "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) @@ -3291,11 +3356,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3295 "util/configparser.c" /* yacc.c:1646 */ +#line 3360 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 937 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 962 "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) @@ -3304,11 +3369,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3308 "util/configparser.c" /* yacc.c:1646 */ +#line 3373 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 947 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 972 "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) @@ -3317,11 +3382,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3321 "util/configparser.c" /* yacc.c:1646 */ +#line 3386 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 957 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 982 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3333,11 +3398,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3337 "util/configparser.c" /* yacc.c:1646 */ +#line 3402 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 970 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 995 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3347,22 +3412,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3351 "util/configparser.c" /* yacc.c:1646 */ +#line 3416 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 981 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1006 "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 3362 "util/configparser.c" /* yacc.c:1646 */ +#line 3427 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 989 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1014 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3374,11 +3439,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3378 "util/configparser.c" /* yacc.c:1646 */ +#line 3443 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1002 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1027 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3386,11 +3451,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3390 "util/configparser.c" /* yacc.c:1646 */ +#line 3455 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1011 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1036 "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) @@ -3398,11 +3463,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3402 "util/configparser.c" /* yacc.c:1646 */ +#line 3467 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1020 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1045 "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) @@ -3410,11 +3475,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3414 "util/configparser.c" /* yacc.c:1646 */ +#line 3479 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1029 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1054 "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) @@ -3423,11 +3488,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3427 "util/configparser.c" /* yacc.c:1646 */ +#line 3492 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1039 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1064 "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) @@ -3436,22 +3501,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3440 "util/configparser.c" /* yacc.c:1646 */ +#line 3505 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1049 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1074 "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 3451 "util/configparser.c" /* yacc.c:1646 */ +#line 3516 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1057 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1082 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3463,11 +3528,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3467 "util/configparser.c" /* yacc.c:1646 */ +#line 3532 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1070 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1095 "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) @@ -3475,22 +3540,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3479 "util/configparser.c" /* yacc.c:1646 */ +#line 3544 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1079 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1104 "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 3490 "util/configparser.c" /* yacc.c:1646 */ +#line 3555 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1087 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1112 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3498,22 +3563,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3502 "util/configparser.c" /* yacc.c:1646 */ +#line 3567 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1096 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1121 "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 3513 "util/configparser.c" /* yacc.c:1646 */ +#line 3578 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1104 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1129 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3525,11 +3590,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3529 "util/configparser.c" /* yacc.c:1646 */ +#line 3594 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1117 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1142 "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) @@ -3537,21 +3602,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3541 "util/configparser.c" /* yacc.c:1646 */ +#line 3606 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1126 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1151 "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 3551 "util/configparser.c" /* yacc.c:1646 */ +#line 3616 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1133 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1158 "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) @@ -3560,11 +3625,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3564 "util/configparser.c" /* yacc.c:1646 */ +#line 3629 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1143 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1168 "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) @@ -3573,11 +3638,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3577 "util/configparser.c" /* yacc.c:1646 */ +#line 3642 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1153 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1178 "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) @@ -3586,11 +3651,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3590 "util/configparser.c" /* yacc.c:1646 */ +#line 3655 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1163 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1188 "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) @@ -3599,11 +3664,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3603 "util/configparser.c" /* yacc.c:1646 */ +#line 3668 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1173 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1198 "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) @@ -3612,11 +3677,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3616 "util/configparser.c" /* yacc.c:1646 */ +#line 3681 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1183 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1208 "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) @@ -3625,11 +3690,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3629 "util/configparser.c" /* yacc.c:1646 */ +#line 3694 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1193 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1218 "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) @@ -3638,11 +3703,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3642 "util/configparser.c" /* yacc.c:1646 */ +#line 3707 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1203 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1228 "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) @@ -3651,41 +3716,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3655 "util/configparser.c" /* yacc.c:1646 */ +#line 3720 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1213 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1238 "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 3665 "util/configparser.c" /* yacc.c:1646 */ +#line 3730 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1220 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1245 "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 3675 "util/configparser.c" /* yacc.c:1646 */ +#line 3740 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1227 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1252 "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 3685 "util/configparser.c" /* yacc.c:1646 */ +#line 3750 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1234 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1259 "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) @@ -3693,11 +3758,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3697 "util/configparser.c" /* yacc.c:1646 */ +#line 3762 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1243 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1268 "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) @@ -3705,11 +3770,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3709 "util/configparser.c" /* yacc.c:1646 */ +#line 3774 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1252 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1277 "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) @@ -3717,21 +3782,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3721 "util/configparser.c" /* yacc.c:1646 */ +#line 3786 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1261 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1286 "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 3731 "util/configparser.c" /* yacc.c:1646 */ +#line 3796 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1268 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1293 "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) @@ -3740,11 +3805,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3744 "util/configparser.c" /* yacc.c:1646 */ +#line 3809 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1278 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1303 "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 && @@ -3760,21 +3825,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3764 "util/configparser.c" /* yacc.c:1646 */ +#line 3829 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1295 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1320 "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 3774 "util/configparser.c" /* yacc.c:1646 */ +#line 3839 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1302 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1327 "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) { @@ -3791,11 +3856,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3795 "util/configparser.c" /* yacc.c:1646 */ +#line 3860 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1320 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1345 "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) { @@ -3807,11 +3872,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3811 "util/configparser.c" /* yacc.c:1646 */ +#line 3876 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1333 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1358 "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) { @@ -3823,11 +3888,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3827 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1346 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1371 "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) @@ -3835,11 +3900,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3839 "util/configparser.c" /* yacc.c:1646 */ +#line 3904 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1355 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1380 "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) @@ -3847,11 +3912,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3851 "util/configparser.c" /* yacc.c:1646 */ +#line 3916 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1364 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1389 "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) @@ -3859,11 +3924,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3863 "util/configparser.c" /* yacc.c:1646 */ +#line 3928 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1373 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1398 "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) @@ -3871,11 +3936,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3875 "util/configparser.c" /* yacc.c:1646 */ +#line 3940 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1382 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1407 "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) @@ -3884,11 +3949,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3888 "util/configparser.c" /* yacc.c:1646 */ +#line 3953 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1392 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1417 "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) @@ -3897,11 +3962,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3901 "util/configparser.c" /* yacc.c:1646 */ +#line 3966 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1402 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1427 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3911,11 +3976,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3915 "util/configparser.c" /* yacc.c:1646 */ +#line 3980 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1413 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1438 "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) @@ -3923,11 +3988,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3927 "util/configparser.c" /* yacc.c:1646 */ +#line 3992 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1422 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1447 "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) @@ -3935,11 +4000,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3939 "util/configparser.c" /* yacc.c:1646 */ +#line 4004 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1431 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1456 "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) @@ -3951,11 +4016,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3955 "util/configparser.c" /* yacc.c:1646 */ +#line 4020 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1444 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1469 "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) @@ -3967,11 +4032,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3971 "util/configparser.c" /* yacc.c:1646 */ +#line 4036 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1457 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1482 "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) @@ -3979,21 +4044,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3983 "util/configparser.c" /* yacc.c:1646 */ +#line 4048 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1466 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1491 "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 3993 "util/configparser.c" /* yacc.c:1646 */ +#line 4058 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1473 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1498 "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) @@ -4001,11 +4066,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4005 "util/configparser.c" /* yacc.c:1646 */ +#line 4070 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1482 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1507 "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) @@ -4013,11 +4078,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4017 "util/configparser.c" /* yacc.c:1646 */ +#line 4082 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1491 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1516 "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) @@ -4025,11 +4090,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4029 "util/configparser.c" /* yacc.c:1646 */ +#line 4094 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1500 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1525 "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) @@ -4038,22 +4103,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4042 "util/configparser.c" /* yacc.c:1646 */ +#line 4107 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1509 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1534 "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 4053 "util/configparser.c" /* yacc.c:1646 */ +#line 4118 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1517 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1542 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4065,22 +4130,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4069 "util/configparser.c" /* yacc.c:1646 */ +#line 4134 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1530 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1555 "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 4080 "util/configparser.c" /* yacc.c:1646 */ +#line 4145 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1538 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1563 "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 && @@ -4108,21 +4173,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4112 "util/configparser.c" /* yacc.c:1646 */ +#line 4177 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1567 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1592 "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 4122 "util/configparser.c" /* yacc.c:1646 */ +#line 4187 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1574 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1599 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4136,11 +4201,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4140 "util/configparser.c" /* yacc.c:1646 */ +#line 4205 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1589 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1614 "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) @@ -4149,11 +4214,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4153 "util/configparser.c" /* yacc.c:1646 */ +#line 4218 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1599 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1624 "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) @@ -4162,31 +4227,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4166 "util/configparser.c" /* yacc.c:1646 */ +#line 4231 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1609 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1634 "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 4176 "util/configparser.c" /* yacc.c:1646 */ +#line 4241 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1616 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1641 "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 4186 "util/configparser.c" /* yacc.c:1646 */ +#line 4251 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1623 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1648 "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) @@ -4194,11 +4259,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4198 "util/configparser.c" /* yacc.c:1646 */ +#line 4263 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1632 "util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1657 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4211,11 +4276,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4215 "util/configparser.c" /* yacc.c:1646 */ +#line 4280 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1646 "util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1671 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4233,11 +4298,11 @@ yyreduce: } } } -#line 4237 "util/configparser.c" /* yacc.c:1646 */ +#line 4302 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1665 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1690 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4255,11 +4320,11 @@ yyreduce: } } } -#line 4259 "util/configparser.c" /* yacc.c:1646 */ +#line 4324 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1684 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1709 "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, @@ -4270,11 +4335,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4274 "util/configparser.c" /* yacc.c:1646 */ +#line 4339 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1696 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1721 "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, @@ -4285,11 +4350,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4289 "util/configparser.c" /* yacc.c:1646 */ +#line 4354 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1708 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1733 "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, @@ -4300,11 +4365,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4304 "util/configparser.c" /* yacc.c:1646 */ +#line 4369 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1720 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1745 "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, @@ -4314,11 +4379,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4318 "util/configparser.c" /* yacc.c:1646 */ +#line 4383 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1731 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1756 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4336,11 +4401,11 @@ yyreduce: } } } -#line 4340 "util/configparser.c" /* yacc.c:1646 */ +#line 4405 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1750 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1775 "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) @@ -4348,11 +4413,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4352 "util/configparser.c" /* yacc.c:1646 */ +#line 4417 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1760 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1785 "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) @@ -4360,33 +4425,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4364 "util/configparser.c" /* yacc.c:1646 */ +#line 4429 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1769 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1794 "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 4375 "util/configparser.c" /* yacc.c:1646 */ +#line 4440 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1777 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1802 "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 4386 "util/configparser.c" /* yacc.c:1646 */ +#line 4451 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1785 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1810 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4398,11 +4463,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4402 "util/configparser.c" /* yacc.c:1646 */ +#line 4467 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1798 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1823 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4414,11 +4479,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4418 "util/configparser.c" /* yacc.c:1646 */ +#line 4483 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1811 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1836 "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) { @@ -4430,11 +4495,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4434 "util/configparser.c" /* yacc.c:1646 */ +#line 4499 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1824 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1849 "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) { @@ -4446,11 +4511,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4450 "util/configparser.c" /* yacc.c:1646 */ +#line 4515 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1837 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1862 "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) @@ -4458,11 +4523,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4462 "util/configparser.c" /* yacc.c:1646 */ +#line 4527 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1846 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1871 "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) @@ -4470,11 +4535,35 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4474 "util/configparser.c" /* yacc.c:1646 */ +#line 4539 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1855 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1880 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_low_rtt:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->low_rtt = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 4551 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 376: +#line 1889 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_low_rtt_pct:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->low_rtt_pct = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 4563 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 377: +#line 1898 "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) @@ -4483,11 +4572,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4487 "util/configparser.c" /* yacc.c:1646 */ +#line 4576 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1865 "util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1908 "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) @@ -4496,11 +4585,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4500 "util/configparser.c" /* yacc.c:1646 */ +#line 4589 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1875 "util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1918 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4512,11 +4601,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4516 "util/configparser.c" /* yacc.c:1646 */ +#line 4605 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1888 "util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1931 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4528,11 +4617,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4532 "util/configparser.c" /* yacc.c:1646 */ +#line 4621 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1901 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1944 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4542,11 +4631,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4546 "util/configparser.c" /* yacc.c:1646 */ +#line 4635 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1912 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1955 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4558,11 +4647,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4562 "util/configparser.c" /* yacc.c:1646 */ +#line 4651 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1925 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1968 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4572,11 +4661,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4576 "util/configparser.c" /* yacc.c:1646 */ +#line 4665 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1936 "util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1979 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4588,11 +4677,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4592 "util/configparser.c" /* yacc.c:1646 */ +#line 4681 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1949 "util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1992 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4601,31 +4690,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4605 "util/configparser.c" /* yacc.c:1646 */ +#line 4694 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 1959 "util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 2002 "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 4615 "util/configparser.c" /* yacc.c:1646 */ +#line 4704 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 1966 "util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 2009 "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 4625 "util/configparser.c" /* yacc.c:1646 */ +#line 4714 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1973 "util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 2016 "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) @@ -4633,11 +4722,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4637 "util/configparser.c" /* yacc.c:1646 */ +#line 4726 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1982 "util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 2025 "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) @@ -4646,11 +4735,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4650 "util/configparser.c" /* yacc.c:1646 */ +#line 4739 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1992 "util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 2035 "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) @@ -4659,11 +4748,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4663 "util/configparser.c" /* yacc.c:1646 */ +#line 4752 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 2002 "util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 2045 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4672,31 +4761,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4676 "util/configparser.c" /* yacc.c:1646 */ +#line 4765 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 2012 "util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 2055 "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 4686 "util/configparser.c" /* yacc.c:1646 */ +#line 4775 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 2019 "util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 2062 "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 4696 "util/configparser.c" /* yacc.c:1646 */ +#line 4785 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 2026 "util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 2069 "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) @@ -4704,11 +4793,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4708 "util/configparser.c" /* yacc.c:1646 */ +#line 4797 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 2035 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 2078 "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) @@ -4717,11 +4806,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4721 "util/configparser.c" /* yacc.c:1646 */ +#line 4810 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 2045 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2088 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -4730,41 +4819,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 4734 "util/configparser.c" /* yacc.c:1646 */ +#line 4823 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2055 "util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2098 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 4744 "util/configparser.c" /* yacc.c:1646 */ +#line 4833 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2062 "util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2105 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(master:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4754 "util/configparser.c" /* yacc.c:1646 */ +#line 4843 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2069 "util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2112 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(url:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4764 "util/configparser.c" /* yacc.c:1646 */ +#line 4853 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2076 "util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2119 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, + (yyvsp[0].str))) + yyerror("out of memory"); + } +#line 4864 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 401: +#line 2127 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4773,11 +4873,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4777 "util/configparser.c" /* yacc.c:1646 */ +#line 4877 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2086 "util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 2137 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4786,11 +4886,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4790 "util/configparser.c" /* yacc.c:1646 */ +#line 4890 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2096 "util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 2147 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4799,11 +4899,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4803 "util/configparser.c" /* yacc.c:1646 */ +#line 4903 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2106 "util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 2157 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4812,11 +4912,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4816 "util/configparser.c" /* yacc.c:1646 */ +#line 4916 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2116 "util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 2167 "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 && @@ -4845,11 +4945,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4849 "util/configparser.c" /* yacc.c:1646 */ +#line 4949 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2146 "util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 2197 "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)); @@ -4858,22 +4958,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4862 "util/configparser.c" /* yacc.c:1646 */ +#line 4962 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2156 "util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 2207 "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 4873 "util/configparser.c" /* yacc.c:1646 */ +#line 4973 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2164 "util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 2215 "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))) { @@ -4881,11 +4981,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4885 "util/configparser.c" /* yacc.c:1646 */ +#line 4985 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2173 "util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 2224 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4899,11 +4999,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4903 "util/configparser.c" /* yacc.c:1646 */ +#line 5003 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 2188 "util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 2239 "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) @@ -4911,19 +5011,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4915 "util/configparser.c" /* yacc.c:1646 */ +#line 5015 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 2197 "util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 2248 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4923 "util/configparser.c" /* yacc.c:1646 */ +#line 5023 "util/configparser.c" /* yacc.c:1646 */ break; - case 412: -#line 2208 "util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2259 "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) @@ -4932,11 +5032,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4936 "util/configparser.c" /* yacc.c:1646 */ +#line 5036 "util/configparser.c" /* yacc.c:1646 */ break; - case 413: -#line 2218 "util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2269 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4944,21 +5044,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4948 "util/configparser.c" /* yacc.c:1646 */ +#line 5048 "util/configparser.c" /* yacc.c:1646 */ break; - case 414: -#line 2227 "util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2278 "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 4958 "util/configparser.c" /* yacc.c:1646 */ +#line 5058 "util/configparser.c" /* yacc.c:1646 */ break; - case 415: -#line 2234 "util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2285 "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) @@ -4967,122 +5067,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4971 "util/configparser.c" /* yacc.c:1646 */ +#line 5071 "util/configparser.c" /* yacc.c:1646 */ break; - case 416: -#line 2244 "util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2295 "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 4981 "util/configparser.c" /* yacc.c:1646 */ +#line 5081 "util/configparser.c" /* yacc.c:1646 */ break; - case 417: -#line 2251 "util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2302 "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 4991 "util/configparser.c" /* yacc.c:1646 */ +#line 5091 "util/configparser.c" /* yacc.c:1646 */ break; - case 418: -#line 2258 "util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2309 "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 5001 "util/configparser.c" /* yacc.c:1646 */ +#line 5101 "util/configparser.c" /* yacc.c:1646 */ break; - case 419: -#line 2265 "util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2316 "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 5011 "util/configparser.c" /* yacc.c:1646 */ +#line 5111 "util/configparser.c" /* yacc.c:1646 */ break; - case 420: -#line 2272 "util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2323 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5019 "util/configparser.c" /* yacc.c:1646 */ +#line 5119 "util/configparser.c" /* yacc.c:1646 */ break; - case 435: -#line 2289 "util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2340 "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 5030 "util/configparser.c" /* yacc.c:1646 */ +#line 5130 "util/configparser.c" /* yacc.c:1646 */ break; - case 436: -#line 2297 "util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2348 "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 5040 "util/configparser.c" /* yacc.c:1646 */ +#line 5140 "util/configparser.c" /* yacc.c:1646 */ break; - case 437: -#line 2304 "util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2355 "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 5051 "util/configparser.c" /* yacc.c:1646 */ +#line 5151 "util/configparser.c" /* yacc.c:1646 */ break; - case 438: -#line 2312 "util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2363 "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 5062 "util/configparser.c" /* yacc.c:1646 */ +#line 5162 "util/configparser.c" /* yacc.c:1646 */ break; - case 439: -#line 2320 "util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2371 "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 5072 "util/configparser.c" /* yacc.c:1646 */ +#line 5172 "util/configparser.c" /* yacc.c:1646 */ break; - case 440: -#line 2327 "util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2378 "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 5082 "util/configparser.c" /* yacc.c:1646 */ +#line 5182 "util/configparser.c" /* yacc.c:1646 */ break; - case 441: -#line 2334 "util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2385 "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) @@ -5090,11 +5190,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5094 "util/configparser.c" /* yacc.c:1646 */ +#line 5194 "util/configparser.c" /* yacc.c:1646 */ break; - case 442: -#line 2343 "util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2394 "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) @@ -5102,11 +5202,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5106 "util/configparser.c" /* yacc.c:1646 */ +#line 5206 "util/configparser.c" /* yacc.c:1646 */ break; - case 443: -#line 2352 "util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2403 "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) @@ -5114,11 +5214,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5118 "util/configparser.c" /* yacc.c:1646 */ +#line 5218 "util/configparser.c" /* yacc.c:1646 */ break; - case 444: -#line 2361 "util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2412 "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) @@ -5126,11 +5226,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5130 "util/configparser.c" /* yacc.c:1646 */ +#line 5230 "util/configparser.c" /* yacc.c:1646 */ break; - case 445: -#line 2370 "util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2421 "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) @@ -5138,11 +5238,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5142 "util/configparser.c" /* yacc.c:1646 */ +#line 5242 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2379 "util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2430 "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) @@ -5150,29 +5250,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5154 "util/configparser.c" /* yacc.c:1646 */ +#line 5254 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2388 "util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2439 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 5162 "util/configparser.c" /* yacc.c:1646 */ +#line 5262 "util/configparser.c" /* yacc.c:1646 */ break; - case 451: -#line 2397 "util/configparser.y" /* yacc.c:1646 */ + case 461: +#line 2448 "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 5172 "util/configparser.c" /* yacc.c:1646 */ +#line 5272 "util/configparser.c" /* yacc.c:1646 */ break; - case 452: -#line 2403 "util/configparser.y" /* yacc.c:1646 */ + case 462: +#line 2454 "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) @@ -5181,21 +5281,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5185 "util/configparser.c" /* yacc.c:1646 */ +#line 5285 "util/configparser.c" /* yacc.c:1646 */ break; - case 453: -#line 2413 "util/configparser.y" /* yacc.c:1646 */ + case 463: +#line 2464 "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 5195 "util/configparser.c" /* yacc.c:1646 */ +#line 5295 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2420 "util/configparser.y" /* yacc.c:1646 */ + case 464: +#line 2471 "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)); @@ -5203,31 +5303,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5207 "util/configparser.c" /* yacc.c:1646 */ +#line 5307 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2429 "util/configparser.y" /* yacc.c:1646 */ + case 465: +#line 2480 "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 5218 "util/configparser.c" /* yacc.c:1646 */ +#line 5318 "util/configparser.c" /* yacc.c:1646 */ break; - case 456: -#line 2437 "util/configparser.y" /* yacc.c:1646 */ + case 466: +#line 2488 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5227 "util/configparser.c" /* yacc.c:1646 */ +#line 5327 "util/configparser.c" /* yacc.c:1646 */ break; - case 469: -#line 2454 "util/configparser.y" /* yacc.c:1646 */ + case 479: +#line 2505 "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) @@ -5235,11 +5335,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5239 "util/configparser.c" /* yacc.c:1646 */ +#line 5339 "util/configparser.c" /* yacc.c:1646 */ break; - case 470: -#line 2464 "util/configparser.y" /* yacc.c:1646 */ + case 480: +#line 2515 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5248,21 +5348,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5252 "util/configparser.c" /* yacc.c:1646 */ +#line 5352 "util/configparser.c" /* yacc.c:1646 */ break; - case 471: -#line 2474 "util/configparser.y" /* yacc.c:1646 */ + case 481: +#line 2525 "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 5262 "util/configparser.c" /* yacc.c:1646 */ +#line 5362 "util/configparser.c" /* yacc.c:1646 */ break; - case 472: -#line 2481 "util/configparser.y" /* yacc.c:1646 */ + case 482: +#line 2532 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -5270,21 +5370,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 5274 "util/configparser.c" /* yacc.c:1646 */ +#line 5374 "util/configparser.c" /* yacc.c:1646 */ break; - case 473: -#line 2490 "util/configparser.y" /* yacc.c:1646 */ + case 483: +#line 2541 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); } -#line 5284 "util/configparser.c" /* yacc.c:1646 */ +#line 5384 "util/configparser.c" /* yacc.c:1646 */ break; - case 474: -#line 2497 "util/configparser.y" /* yacc.c:1646 */ + case 484: +#line 2548 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -5292,22 +5392,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 5296 "util/configparser.c" /* yacc.c:1646 */ +#line 5396 "util/configparser.c" /* yacc.c:1646 */ break; - case 475: -#line 2506 "util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2557 "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 5307 "util/configparser.c" /* yacc.c:1646 */ +#line 5407 "util/configparser.c" /* yacc.c:1646 */ break; - case 476: -#line 2514 "util/configparser.y" /* yacc.c:1646 */ + case 486: +#line 2565 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5319,22 +5419,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5323 "util/configparser.c" /* yacc.c:1646 */ +#line 5423 "util/configparser.c" /* yacc.c:1646 */ break; - case 477: -#line 2527 "util/configparser.y" /* yacc.c:1646 */ + case 487: +#line 2578 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5334 "util/configparser.c" /* yacc.c:1646 */ +#line 5434 "util/configparser.c" /* yacc.c:1646 */ break; - case 478: -#line 2535 "util/configparser.y" /* yacc.c:1646 */ + case 488: +#line 2586 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5346,19 +5446,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5350 "util/configparser.c" /* yacc.c:1646 */ +#line 5450 "util/configparser.c" /* yacc.c:1646 */ break; - case 479: -#line 2548 "util/configparser.y" /* yacc.c:1646 */ + case 489: +#line 2599 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5358 "util/configparser.c" /* yacc.c:1646 */ +#line 5458 "util/configparser.c" /* yacc.c:1646 */ break; - case 484: -#line 2557 "util/configparser.y" /* yacc.c:1646 */ + case 497: +#line 2609 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5371,11 +5471,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5375 "util/configparser.c" /* yacc.c:1646 */ +#line 5475 "util/configparser.c" /* yacc.c:1646 */ break; - case 485: -#line 2571 "util/configparser.y" /* yacc.c:1646 */ + case 498: +#line 2623 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5389,11 +5489,60 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5393 "util/configparser.c" /* yacc.c:1646 */ +#line 5493 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 499: +#line 2638 "util/configparser.y" /* yacc.c:1646 */ + { + #if defined(USE_CACHEDB) && defined(USE_REDIS) + OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); + free(cfg_parser->cfg->redis_server_host); + cfg_parser->cfg->redis_server_host = (yyvsp[0].str); + #else + OUTYY(("P(Compiled without cachedb or redis, ignoring)\n")); + free((yyvsp[0].str)); + #endif + } +#line 5508 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 500: +#line 2650 "util/configparser.y" /* yacc.c:1646 */ + { + #if defined(USE_CACHEDB) && defined(USE_REDIS) + int port; + OUTYY(("P(redis_server_port:%s)\n", (yyvsp[0].str))); + port = atoi((yyvsp[0].str)); + if(port == 0 || port < 0 || port > 65535) + yyerror("valid redis server port number expected"); + else cfg_parser->cfg->redis_server_port = port; + #else + OUTYY(("P(Compiled without cachedb or redis, ignoring)\n")); + #endif + free((yyvsp[0].str)); + } +#line 5526 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 501: +#line 2665 "util/configparser.y" /* yacc.c:1646 */ + { + #if defined(USE_CACHEDB) && defined(USE_REDIS) + OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0) + yyerror("redis timeout value expected"); + else cfg_parser->cfg->redis_timeout = atoi((yyvsp[0].str)); + #else + OUTYY(("P(Compiled without cachedb or redis, ignoring)\n")); + #endif + free((yyvsp[0].str)); + } +#line 5542 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5397 "util/configparser.c" /* yacc.c:1646 */ +#line 5546 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5621,7 +5770,7 @@ yyreturn: #endif return yyresult; } -#line 2585 "util/configparser.y" /* yacc.c:1906 */ +#line 2677 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |