diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 1943 |
1 files changed, 982 insertions, 961 deletions
diff --git a/util/configparser.c b/util/configparser.c index d0e99df81769..227dd0ae9b25 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -361,10 +361,11 @@ extern int yydebug; VAR_URL = 490, VAR_FOR_DOWNSTREAM = 491, VAR_FALLBACK_ENABLED = 492, - VAR_ADDITIONAL_TLS_PORT = 493, + VAR_TLS_ADDITIONAL_PORTS = 493, VAR_LOW_RTT = 494, - VAR_LOW_RTT_PCT = 495, - VAR_ALLOW_NOTIFY = 496 + VAR_LOW_RTT_PERMIL = 495, + VAR_ALLOW_NOTIFY = 496, + VAR_TLS_WIN_CERT = 497 }; #endif /* Tokens. */ @@ -603,10 +604,11 @@ extern int yydebug; #define VAR_URL 490 #define VAR_FOR_DOWNSTREAM 491 #define VAR_FALLBACK_ENABLED 492 -#define VAR_ADDITIONAL_TLS_PORT 493 +#define VAR_TLS_ADDITIONAL_PORTS 493 #define VAR_LOW_RTT 494 -#define VAR_LOW_RTT_PCT 495 +#define VAR_LOW_RTT_PERMIL 495 #define VAR_ALLOW_NOTIFY 496 +#define VAR_TLS_WIN_CERT 497 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -617,7 +619,7 @@ union YYSTYPE char* str; -#line 621 "util/configparser.c" /* yacc.c:355 */ +#line 623 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -634,7 +636,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 638 "util/configparser.c" /* yacc.c:358 */ +#line 640 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -876,21 +878,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 489 +#define YYLAST 491 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 242 +#define YYNTOKENS 243 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 262 +#define YYNNTS 263 /* YYNRULES -- Number of rules. */ -#define YYNRULES 501 +#define YYNRULES 503 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 750 +#define YYNSTATES 753 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 496 +#define YYMAXUTOK 497 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -948,7 +950,7 @@ static const yytype_uint8 yytranslate[] = 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 + 235, 236, 237, 238, 239, 240, 241, 242 }; #if YYDEBUG @@ -973,39 +975,39 @@ static const yytype_uint16 yyrline[] = 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 + 251, 251, 251, 252, 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, + 700, 708, 717, 726, 740, 749, 758, 767, 774, 781, + 807, 815, 822, 829, 836, 843, 851, 859, 867, 874, + 885, 896, 903, 912, 921, 930, 937, 944, 952, 960, + 970, 980, 990, 1003, 1014, 1022, 1035, 1044, 1053, 1062, + 1072, 1082, 1090, 1103, 1112, 1120, 1129, 1137, 1150, 1159, + 1166, 1176, 1186, 1196, 1206, 1216, 1226, 1236, 1246, 1253, + 1260, 1267, 1276, 1285, 1294, 1301, 1311, 1329, 1336, 1354, + 1367, 1380, 1389, 1398, 1407, 1416, 1426, 1436, 1447, 1456, + 1465, 1478, 1491, 1500, 1507, 1516, 1525, 1534, 1543, 1551, + 1564, 1572, 1601, 1608, 1623, 1633, 1643, 1650, 1657, 1666, + 1680, 1699, 1718, 1730, 1742, 1754, 1765, 1784, 1794, 1803, + 1811, 1819, 1832, 1845, 1858, 1871, 1880, 1889, 1898, 1907, + 1917, 1927, 1940, 1953, 1964, 1977, 1988, 2001, 2011, 2018, + 2025, 2034, 2044, 2054, 2064, 2071, 2078, 2087, 2097, 2107, + 2114, 2121, 2128, 2136, 2146, 2156, 2166, 2176, 2206, 2216, + 2224, 2233, 2248, 2257, 2262, 2263, 2264, 2264, 2264, 2265, + 2265, 2265, 2266, 2266, 2268, 2278, 2287, 2294, 2304, 2311, + 2318, 2325, 2332, 2337, 2338, 2339, 2339, 2340, 2340, 2341, + 2341, 2342, 2343, 2344, 2345, 2346, 2347, 2349, 2357, 2364, + 2372, 2380, 2387, 2394, 2403, 2412, 2421, 2430, 2439, 2448, + 2453, 2454, 2455, 2457, 2463, 2473, 2480, 2489, 2497, 2503, + 2504, 2506, 2506, 2506, 2507, 2507, 2508, 2509, 2510, 2511, + 2512, 2514, 2524, 2534, 2541, 2550, 2557, 2566, 2574, 2587, + 2595, 2608, 2613, 2614, 2615, 2615, 2616, 2616, 2616, 2618, + 2632, 2647, 2659, 2674 }; #endif @@ -1101,13 +1103,13 @@ static const char *const yytname[] = "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", + "VAR_TLS_ADDITIONAL_PORTS", "VAR_LOW_RTT", "VAR_LOW_RTT_PERMIL", + "VAR_ALLOW_NOTIFY", "VAR_TLS_WIN_CERT", "$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", @@ -1121,10 +1123,11 @@ 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_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_tls_cert_bundle", "server_tls_win_cert", + "server_tls_additional_ports", "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", @@ -1172,7 +1175,7 @@ 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_low_rtt", "server_low_rtt_pct", + "server_ratelimit_factor", "server_low_rtt", "server_low_rtt_permil", "server_qname_minimisation", "server_qname_minimisation_strict", "server_ipsecmod_enabled", "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook", "server_ipsecmod_max_ttl", @@ -1240,7 +1243,7 @@ static const yytype_uint16 yytoknum[] = 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, - 495, 496 + 495, 496, 497 }; # endif @@ -1278,7 +1281,7 @@ static const yytype_int16 yypact[] = 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, + 303, 304, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, @@ -1294,45 +1297,46 @@ static const yytype_int16 yypact[] = -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -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, 305, 306, 307, 308, 309, 310, -184, -184, -184, + -184, -184, -184, -184, 314, 318, 319, 343, 344, -184, + -184, -184, -184, -184, -184, 345, 347, 357, 358, 359, + 360, 361, -184, -184, -184, -184, -184, -184, -184, -184, + 362, 363, 364, 365, 366, 367, 368, 369, -184, -184, + -184, -184, -184, -184, -184, -184, -184, 404, 406, 418, + 419, 420, 421, 422, 423, -184, -184, -184, -184, -184, + -184, -184, -184, -184, 424, 425, 426, 427, 428, 435, + 436, 437, 438, 439, 440, 442, -184, -184, -184, -184, + -184, -184, -184, -184, -184, -184, -184, -184, -184, 443, + -184, -184, 444, 445, 446, 447, 448, 452, 454, 455, + 456, 457, -184, -184, -184, -184, -184, -184, -184, -184, + -184, -184, -184, 458, 459, 460, 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, -184, -184, -184, -184, -184, -184, -184, 461, 462, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, + 463, 464, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -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, 465, 466, 467, -184, -184, + -184, -184, -184, -184, -184, -184, -184, 468, 469, -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, 470, 471, 472, 473, 474, 475, -184, -184, -184, -184, -184, -184, -184, -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, 476, -184, -184, 477, 478, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -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 + -184, -184, -184, 479, 480, 481, -184, -184, -184, -184, + -184, -184, -184 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1340,9 +1344,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 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, + 2, 0, 1, 14, 185, 194, 413, 459, 432, 202, + 468, 491, 212, 3, 16, 187, 196, 204, 214, 415, + 434, 461, 470, 493, 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, @@ -1360,61 +1364,62 @@ 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, 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 + 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, 178, 113, 114, 115, 116, 180, 184, + 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, 186, 188, 189, + 190, 192, 193, 191, 0, 0, 0, 0, 0, 195, + 197, 198, 199, 200, 201, 0, 0, 0, 0, 0, + 0, 0, 203, 205, 206, 209, 210, 207, 211, 208, + 0, 0, 0, 0, 0, 0, 0, 0, 213, 215, + 216, 217, 218, 222, 219, 220, 221, 0, 0, 0, + 0, 0, 0, 0, 0, 414, 416, 418, 417, 423, + 419, 420, 421, 422, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 433, 435, 436, 437, + 438, 439, 440, 441, 442, 443, 444, 445, 446, 0, + 460, 462, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 469, 471, 472, 473, 475, 476, 474, 477, + 478, 479, 480, 0, 0, 0, 0, 0, 492, 494, + 495, 496, 497, 498, 224, 223, 230, 239, 237, 245, + 246, 249, 247, 248, 250, 251, 267, 268, 269, 270, + 271, 294, 295, 296, 301, 302, 242, 303, 304, 307, + 305, 306, 309, 310, 311, 324, 282, 283, 285, 286, + 312, 327, 276, 278, 328, 334, 335, 336, 243, 293, + 348, 349, 277, 343, 263, 238, 272, 325, 331, 313, + 0, 0, 352, 244, 225, 262, 317, 226, 240, 241, + 273, 274, 350, 315, 319, 320, 227, 353, 297, 323, + 264, 281, 329, 330, 333, 342, 275, 346, 344, 345, + 287, 292, 321, 322, 288, 289, 314, 338, 265, 266, + 252, 254, 255, 256, 257, 258, 354, 355, 356, 298, + 299, 300, 308, 357, 358, 0, 0, 0, 316, 290, + 464, 367, 371, 369, 368, 372, 370, 0, 0, 375, + 376, 231, 232, 233, 234, 235, 236, 318, 332, 347, + 379, 380, 291, 359, 0, 0, 0, 0, 0, 0, + 339, 340, 341, 465, 284, 279, 337, 261, 228, 229, + 280, 381, 383, 382, 384, 385, 386, 253, 260, 377, + 378, 259, 387, 388, 389, 392, 391, 390, 393, 394, + 395, 396, 397, 406, 0, 410, 411, 0, 0, 412, + 398, 404, 399, 400, 401, 403, 405, 402, 424, 426, + 425, 428, 429, 430, 431, 427, 447, 448, 449, 450, + 451, 452, 453, 454, 455, 456, 457, 458, 463, 481, + 482, 483, 486, 484, 485, 487, 488, 489, 490, 499, + 500, 501, 502, 503, 326, 351, 366, 466, 467, 373, + 374, 360, 361, 0, 0, 0, 365, 407, 408, 409, + 364, 362, 363 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1446,39 +1451,39 @@ static const yytype_int16 yypgoto[] = -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -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, 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 + -1, 1, 13, 14, 24, 202, 15, 25, 377, 16, + 26, 389, 17, 27, 402, 18, 28, 418, 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, + 365, 366, 378, 379, 380, 381, 382, 383, 390, 391, + 392, 393, 394, 419, 420, 421, 422, 423, 424, 425, + 426, 403, 404, 405, 406, 407, 408, 409, 19, 29, + 435, 436, 437, 438, 439, 440, 441, 442, 443, 20, + 30, 456, 457, 458, 459, 460, 461, 462, 463, 464, + 465, 466, 467, 468, 21, 31, 470, 471, 367, 368, + 369, 370, 22, 32, 482, 483, 484, 485, 486, 487, + 488, 489, 490, 491, 492, 23, 33, 498, 499, 500, + 501, 502, 503 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1486,55 +1491,56 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 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, + 2, 410, 395, 371, 469, 372, 373, 504, 384, 505, + 0, 3, 506, 507, 508, 509, 385, 386, 444, 445, + 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, + 427, 428, 429, 430, 431, 432, 433, 434, 396, 397, + 510, 4, 493, 494, 495, 496, 497, 5, 472, 473, + 474, 475, 476, 477, 478, 479, 480, 481, 511, 512, + 513, 514, 515, 398, 516, 517, 374, 518, 519, 520, + 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, + 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, + 541, 6, 542, 543, 544, 545, 375, 546, 547, 376, + 387, 548, 388, 549, 550, 551, 552, 7, 553, 554, + 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, + 565, 566, 399, 400, 567, 568, 569, 570, 571, 572, + 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 583, 584, 585, 586, 587, 588, 8, 589, 590, 591, + 592, 593, 594, 595, 596, 597, 598, 401, 599, 600, + 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, + 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, + 631, 632, 411, 9, 412, 413, 414, 415, 416, 633, + 634, 635, 417, 636, 637, 638, 639, 10, 640, 641, + 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, + 652, 653, 654, 655, 11, 656, 657, 658, 659, 660, + 661, 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, + 61, 662, 663, 664, 665, 62, 63, 64, 666, 667, + 668, 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, + 104, 105, 669, 670, 671, 672, 673, 674, 675, 676, + 677, 106, 107, 108, 678, 109, 110, 111, 679, 680, 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, + 132, 133, 134, 681, 682, 683, 135, 684, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 685, 686, 687, + 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 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 + 175, 176, 177, 178, 698, 179, 699, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 700, 701, + 702, 703, 704, 705, 706, 707, 708, 709, 710, 191, + 192, 193, 194, 195, 196, 711, 712, 713, 714, 715, + 716, 197, 717, 718, 719, 720, 721, 722, 723, 198, + 199, 200, 724, 201, 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, 750, + 751, 752 }; static const yytype_int16 yycheck[] = @@ -1585,19 +1591,20 @@ static const yytype_int16 yycheck[] = 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, + 239, 240, 10, 242, 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 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 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, + 0, 244, 0, 11, 41, 47, 91, 107, 146, 193, + 207, 224, 232, 245, 246, 249, 252, 255, 258, 451, + 462, 477, 485, 498, 247, 250, 253, 256, 259, 452, + 463, 478, 486, 499, 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, @@ -1614,7 +1621,7 @@ static const yytype_uint16 yystos[] = 184, 185, 186, 187, 188, 189, 190, 191, 192, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 218, 219, 220, 221, 222, 223, 230, 238, 239, - 240, 247, 260, 261, 262, 263, 264, 265, 266, 267, + 240, 242, 248, 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, @@ -1630,21 +1637,22 @@ static const yytype_uint16 yystos[] = 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, + 418, 419, 420, 421, 422, 423, 424, 481, 482, 483, + 484, 40, 42, 43, 103, 133, 136, 251, 425, 426, + 427, 428, 429, 430, 40, 48, 49, 132, 134, 254, + 431, 432, 433, 434, 435, 40, 76, 77, 101, 160, + 161, 195, 257, 444, 445, 446, 447, 448, 449, 450, + 40, 231, 233, 234, 235, 236, 237, 241, 260, 436, + 437, 438, 439, 440, 441, 442, 443, 92, 93, 94, + 95, 96, 97, 98, 99, 453, 454, 455, 456, 457, + 458, 459, 460, 461, 147, 148, 149, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 473, 474, 475, 476, 108, + 479, 480, 208, 209, 210, 211, 212, 213, 214, 215, + 216, 217, 487, 488, 489, 490, 491, 492, 493, 494, + 495, 496, 497, 225, 226, 227, 228, 229, 500, 501, + 502, 503, 504, 505, 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, @@ -1668,35 +1676,35 @@ 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 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, + 0, 243, 244, 244, 245, 245, 245, 245, 245, 245, + 245, 245, 245, 245, 246, 247, 247, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 249, 250, 250, 251, 251, + 251, 251, 251, 251, 252, 253, 253, 254, 254, 254, + 254, 254, 255, 256, 256, 257, 257, 257, 257, 257, + 257, 257, 258, 259, 259, 260, 260, 260, 260, 260, + 260, 260, 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, @@ -1715,16 +1723,16 @@ static const yytype_uint16 yyr1[] = 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, + 448, 449, 450, 451, 452, 452, 453, 453, 453, 453, + 453, 453, 453, 453, 454, 455, 456, 457, 458, 459, + 460, 461, 462, 463, 463, 464, 464, 464, 464, 464, + 464, 464, 464, 464, 464, 464, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, + 478, 478, 479, 480, 481, 482, 483, 484, 485, 486, + 486, 487, 487, 487, 487, 487, 487, 487, 487, 487, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, - 497, 497, 498, 498, 498, 498, 498, 499, 500, 501, - 502, 503 + 497, 498, 499, 499, 500, 500, 500, 500, 500, 501, + 502, 503, 504, 505 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1748,11 +1756,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, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 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, @@ -1762,25 +1770,25 @@ 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, 3, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 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, 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, 3, 3, 3, 2, 2, - 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, - 1, 2, 2, 2, 3, 3, 1, 2, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, + 2, 2, 2, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 1, 2, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2 + 2, 0, 1, 2, 2, 2, 3, 3, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2 }; @@ -2461,10 +2469,10 @@ yyreduce: { OUTYY(("\nP(server:)\n")); } -#line 2465 "util/configparser.c" /* yacc.c:1646 */ +#line 2473 "util/configparser.c" /* yacc.c:1646 */ break; - case 184: + case 185: #line 255 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; @@ -2476,10 +2484,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2480 "util/configparser.c" /* yacc.c:1646 */ +#line 2488 "util/configparser.c" /* yacc.c:1646 */ break; - case 193: + case 194: #line 272 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; @@ -2491,10 +2499,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2495 "util/configparser.c" /* yacc.c:1646 */ +#line 2503 "util/configparser.c" /* yacc.c:1646 */ break; - case 201: + case 202: #line 289 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; @@ -2508,10 +2516,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2512 "util/configparser.c" /* yacc.c:1646 */ +#line 2520 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: + case 212: #line 308 "util/configparser.y" /* yacc.c:1646 */ { struct config_auth* s; @@ -2527,10 +2535,10 @@ yyreduce: } else yyerror("out of memory"); } -#line 2531 "util/configparser.c" /* yacc.c:1646 */ +#line 2539 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: + case 223: #line 330 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); @@ -2539,10 +2547,10 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2543 "util/configparser.c" /* yacc.c:1646 */ +#line 2551 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: + case 224: #line 339 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); @@ -2551,10 +2559,10 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2555 "util/configparser.c" /* yacc.c:1646 */ +#line 2563 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: + case 225: #line 348 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); @@ -2565,10 +2573,10 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2569 "util/configparser.c" /* yacc.c:1646 */ +#line 2577 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: + case 226: #line 359 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); @@ -2577,10 +2585,10 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2581 "util/configparser.c" /* yacc.c:1646 */ +#line 2589 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: + case 227: #line 368 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); @@ -2589,10 +2597,10 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2593 "util/configparser.c" /* yacc.c:1646 */ +#line 2601 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: + case 228: #line 377 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); @@ -2601,10 +2609,10 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2605 "util/configparser.c" /* yacc.c:1646 */ +#line 2613 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: + case 229: #line 386 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); @@ -2615,10 +2623,10 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2619 "util/configparser.c" /* yacc.c:1646 */ +#line 2627 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: + case 230: #line 397 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); @@ -2627,10 +2635,10 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2631 "util/configparser.c" /* yacc.c:1646 */ +#line 2639 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: + case 231: #line 406 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2641,10 +2649,10 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2645 "util/configparser.c" /* yacc.c:1646 */ +#line 2653 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: + case 232: #line 417 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2656,10 +2664,10 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2660 "util/configparser.c" /* yacc.c:1646 */ +#line 2668 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: + case 233: #line 430 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2674,10 +2682,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2678 "util/configparser.c" /* yacc.c:1646 */ +#line 2686 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: + case 234: #line 445 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2688,10 +2696,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2692 "util/configparser.c" /* yacc.c:1646 */ +#line 2700 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: + case 235: #line 456 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2708,10 +2716,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2712 "util/configparser.c" /* yacc.c:1646 */ +#line 2720 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: + case 236: #line 473 "util/configparser.y" /* yacc.c:1646 */ { #ifdef CLIENT_SUBNET @@ -2728,10 +2736,10 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2732 "util/configparser.c" /* yacc.c:1646 */ +#line 2740 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: + case 237: #line 490 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); @@ -2744,10 +2752,10 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2748 "util/configparser.c" /* yacc.c:1646 */ +#line 2756 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: + case 238: #line 503 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); @@ -2762,10 +2770,10 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2766 "util/configparser.c" /* yacc.c:1646 */ +#line 2774 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: + case 239: #line 518 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); @@ -2774,10 +2782,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2778 "util/configparser.c" /* yacc.c:1646 */ +#line 2786 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: + case 240: #line 527 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); @@ -2786,10 +2794,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2790 "util/configparser.c" /* yacc.c:1646 */ +#line 2798 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: + case 241: #line 536 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); @@ -2798,10 +2806,10 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2802 "util/configparser.c" /* yacc.c:1646 */ +#line 2810 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: + case 242: #line 545 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); @@ -2810,10 +2818,10 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2814 "util/configparser.c" /* yacc.c:1646 */ +#line 2822 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: + case 243: #line 554 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); @@ -2822,10 +2830,10 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2826 "util/configparser.c" /* yacc.c:1646 */ +#line 2834 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: + case 244: #line 563 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); @@ -2834,10 +2842,10 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2838 "util/configparser.c" /* yacc.c:1646 */ +#line 2846 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: + case 245: #line 572 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); @@ -2846,10 +2854,10 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2850 "util/configparser.c" /* yacc.c:1646 */ +#line 2858 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: + case 246: #line 581 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); @@ -2858,10 +2866,10 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2862 "util/configparser.c" /* yacc.c:1646 */ +#line 2870 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: + case 247: #line 590 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); @@ -2870,10 +2878,10 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2874 "util/configparser.c" /* yacc.c:1646 */ +#line 2882 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: + case 248: #line 599 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); @@ -2882,10 +2890,10 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2886 "util/configparser.c" /* yacc.c:1646 */ +#line 2894 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: + case 249: #line 608 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); @@ -2894,10 +2902,10 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2898 "util/configparser.c" /* yacc.c:1646 */ +#line 2906 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: + case 250: #line 617 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -2906,10 +2914,10 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2910 "util/configparser.c" /* yacc.c:1646 */ +#line 2918 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: + case 251: #line 626 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); @@ -2918,10 +2926,10 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2922 "util/configparser.c" /* yacc.c:1646 */ +#line 2930 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: + case 252: #line 635 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); @@ -2930,10 +2938,10 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2934 "util/configparser.c" /* yacc.c:1646 */ +#line 2942 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: + case 253: #line 644 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str))); @@ -2942,10 +2950,10 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2946 "util/configparser.c" /* yacc.c:1646 */ +#line 2954 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: + case 254: #line 653 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); @@ -2954,30 +2962,30 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2958 "util/configparser.c" /* yacc.c:1646 */ +#line 2966 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: + case 255: #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 2968 "util/configparser.c" /* yacc.c:1646 */ +#line 2976 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: + case 256: #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 2978 "util/configparser.c" /* yacc.c:1646 */ +#line 2986 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: + case 257: #line 676 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); @@ -2986,32 +2994,44 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2990 "util/configparser.c" /* yacc.c:1646 */ +#line 2998 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: + case 258: #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 3000 "util/configparser.c" /* yacc.c:1646 */ +#line 3008 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: + case 259: #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, + OUTYY(("P(server_tls_win_cert:%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->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3020 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 260: +#line 701 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_tls_additional_ports:%s)\n", (yyvsp[0].str))); + if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_ports, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3011 "util/configparser.c" /* yacc.c:1646 */ +#line 3031 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 700 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 709 "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) @@ -3019,11 +3039,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3023 "util/configparser.c" /* yacc.c:1646 */ +#line 3043 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 709 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 718 "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) @@ -3031,11 +3051,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3035 "util/configparser.c" /* yacc.c:1646 */ +#line 3055 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 718 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 727 "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) @@ -3048,11 +3068,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3052 "util/configparser.c" /* yacc.c:1646 */ +#line 3072 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 732 "util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 741 "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) @@ -3060,11 +3080,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3064 "util/configparser.c" /* yacc.c:1646 */ +#line 3084 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 741 "util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 750 "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) @@ -3072,11 +3092,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3076 "util/configparser.c" /* yacc.c:1646 */ +#line 3096 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 750 "util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 759 "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) @@ -3084,31 +3104,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3088 "util/configparser.c" /* yacc.c:1646 */ +#line 3108 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 759 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 768 "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 3098 "util/configparser.c" /* yacc.c:1646 */ +#line 3118 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 766 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 775 "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 3108 "util/configparser.c" /* yacc.c:1646 */ +#line 3128 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 773 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 782 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3133,105 +3153,105 @@ yyreduce: } } } -#line 3137 "util/configparser.c" /* yacc.c:1646 */ +#line 3157 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 799 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 808 "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 3148 "util/configparser.c" /* yacc.c:1646 */ +#line 3168 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 807 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 816 "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 3158 "util/configparser.c" /* yacc.c:1646 */ +#line 3178 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 814 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 823 "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 3168 "util/configparser.c" /* yacc.c:1646 */ +#line 3188 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 821 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 830 "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 3178 "util/configparser.c" /* yacc.c:1646 */ +#line 3198 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 828 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 837 "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 3188 "util/configparser.c" /* yacc.c:1646 */ +#line 3208 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 835 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 844 "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 3199 "util/configparser.c" /* yacc.c:1646 */ +#line 3219 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 843 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 852 "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 3210 "util/configparser.c" /* yacc.c:1646 */ +#line 3230 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 851 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 860 "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 3221 "util/configparser.c" /* yacc.c:1646 */ +#line 3241 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 859 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 868 "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 3231 "util/configparser.c" /* yacc.c:1646 */ +#line 3251 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 866 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 875 "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) @@ -3241,11 +3261,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3245 "util/configparser.c" /* yacc.c:1646 */ +#line 3265 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 877 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 886 "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) @@ -3255,21 +3275,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3259 "util/configparser.c" /* yacc.c:1646 */ +#line 3279 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 888 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 897 "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 3269 "util/configparser.c" /* yacc.c:1646 */ +#line 3289 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 895 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 904 "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) @@ -3277,11 +3297,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3281 "util/configparser.c" /* yacc.c:1646 */ +#line 3301 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 904 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 913 "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) @@ -3289,11 +3309,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3293 "util/configparser.c" /* yacc.c:1646 */ +#line 3313 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 913 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 922 "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) @@ -3301,53 +3321,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3305 "util/configparser.c" /* yacc.c:1646 */ +#line 3325 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 922 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 931 "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 3315 "util/configparser.c" /* yacc.c:1646 */ +#line 3335 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 929 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 938 "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 3325 "util/configparser.c" /* yacc.c:1646 */ +#line 3345 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 936 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 945 "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 3336 "util/configparser.c" /* yacc.c:1646 */ +#line 3356 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 944 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 953 "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 3347 "util/configparser.c" /* yacc.c:1646 */ +#line 3367 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 952 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 961 "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) @@ -3356,11 +3376,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3360 "util/configparser.c" /* yacc.c:1646 */ +#line 3380 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 962 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 971 "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) @@ -3369,11 +3389,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3373 "util/configparser.c" /* yacc.c:1646 */ +#line 3393 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 972 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 981 "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) @@ -3382,11 +3402,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3386 "util/configparser.c" /* yacc.c:1646 */ +#line 3406 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 982 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 991 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3398,11 +3418,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3402 "util/configparser.c" /* yacc.c:1646 */ +#line 3422 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 995 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1004 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3412,22 +3432,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3416 "util/configparser.c" /* yacc.c:1646 */ +#line 3436 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1006 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1015 "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 3427 "util/configparser.c" /* yacc.c:1646 */ +#line 3447 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1014 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1023 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3439,11 +3459,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3443 "util/configparser.c" /* yacc.c:1646 */ +#line 3463 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1027 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1036 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3451,11 +3471,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3455 "util/configparser.c" /* yacc.c:1646 */ +#line 3475 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1036 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1045 "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) @@ -3463,11 +3483,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3467 "util/configparser.c" /* yacc.c:1646 */ +#line 3487 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1045 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1054 "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) @@ -3475,11 +3495,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3479 "util/configparser.c" /* yacc.c:1646 */ +#line 3499 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1054 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1063 "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) @@ -3488,11 +3508,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3492 "util/configparser.c" /* yacc.c:1646 */ +#line 3512 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1064 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1073 "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) @@ -3501,22 +3521,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3505 "util/configparser.c" /* yacc.c:1646 */ +#line 3525 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1074 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1083 "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 3516 "util/configparser.c" /* yacc.c:1646 */ +#line 3536 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1082 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1091 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3528,11 +3548,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3532 "util/configparser.c" /* yacc.c:1646 */ +#line 3552 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1095 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1104 "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) @@ -3540,22 +3560,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3544 "util/configparser.c" /* yacc.c:1646 */ +#line 3564 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1104 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1113 "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 3555 "util/configparser.c" /* yacc.c:1646 */ +#line 3575 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1112 "util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1121 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3563,22 +3583,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3567 "util/configparser.c" /* yacc.c:1646 */ +#line 3587 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1121 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1130 "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 3578 "util/configparser.c" /* yacc.c:1646 */ +#line 3598 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1129 "util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1138 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3590,11 +3610,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3594 "util/configparser.c" /* yacc.c:1646 */ +#line 3614 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1142 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1151 "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) @@ -3602,21 +3622,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3606 "util/configparser.c" /* yacc.c:1646 */ +#line 3626 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1151 "util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1160 "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 3616 "util/configparser.c" /* yacc.c:1646 */ +#line 3636 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1158 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1167 "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) @@ -3625,11 +3645,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3629 "util/configparser.c" /* yacc.c:1646 */ +#line 3649 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1168 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1177 "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) @@ -3638,11 +3658,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3642 "util/configparser.c" /* yacc.c:1646 */ +#line 3662 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1178 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1187 "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) @@ -3651,11 +3671,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3655 "util/configparser.c" /* yacc.c:1646 */ +#line 3675 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1188 "util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1197 "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) @@ -3664,11 +3684,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3668 "util/configparser.c" /* yacc.c:1646 */ +#line 3688 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1198 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1207 "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) @@ -3677,11 +3697,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3681 "util/configparser.c" /* yacc.c:1646 */ +#line 3701 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1208 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1217 "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) @@ -3690,11 +3710,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3694 "util/configparser.c" /* yacc.c:1646 */ +#line 3714 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1218 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1227 "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) @@ -3703,11 +3723,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3707 "util/configparser.c" /* yacc.c:1646 */ +#line 3727 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1228 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1237 "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) @@ -3716,41 +3736,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3720 "util/configparser.c" /* yacc.c:1646 */ +#line 3740 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1238 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1247 "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 3730 "util/configparser.c" /* yacc.c:1646 */ +#line 3750 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1245 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1254 "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 3740 "util/configparser.c" /* yacc.c:1646 */ +#line 3760 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1252 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1261 "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 3750 "util/configparser.c" /* yacc.c:1646 */ +#line 3770 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1259 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1268 "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) @@ -3758,11 +3778,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3762 "util/configparser.c" /* yacc.c:1646 */ +#line 3782 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1268 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1277 "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) @@ -3770,11 +3790,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3774 "util/configparser.c" /* yacc.c:1646 */ +#line 3794 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1277 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1286 "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) @@ -3782,21 +3802,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3786 "util/configparser.c" /* yacc.c:1646 */ +#line 3806 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1286 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1295 "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 3796 "util/configparser.c" /* yacc.c:1646 */ +#line 3816 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1293 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1302 "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) @@ -3805,41 +3825,42 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3809 "util/configparser.c" /* yacc.c:1646 */ +#line 3829 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1303 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1312 "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 && strcmp((yyvsp[0].str), "deny_non_local")!=0 && strcmp((yyvsp[0].str), "refuse_non_local")!=0 && + strcmp((yyvsp[0].str), "allow_setrd")!=0 && strcmp((yyvsp[0].str), "allow")!=0 && strcmp((yyvsp[0].str), "allow_snoop")!=0) { yyerror("expected deny, refuse, deny_non_local, " - "refuse_non_local, allow or allow_snoop " - "in access control action"); + "refuse_non_local, allow, allow_setrd or " + "allow_snoop in access control action"); } else { if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding acl"); } } -#line 3829 "util/configparser.c" /* yacc.c:1646 */ +#line 3850 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1320 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1330 "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 3839 "util/configparser.c" /* yacc.c:1646 */ +#line 3860 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1327 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1337 "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) { @@ -3856,11 +3877,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3860 "util/configparser.c" /* yacc.c:1646 */ +#line 3881 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1345 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1355 "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) { @@ -3872,11 +3893,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3876 "util/configparser.c" /* yacc.c:1646 */ +#line 3897 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1358 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1368 "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) { @@ -3888,11 +3909,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3892 "util/configparser.c" /* yacc.c:1646 */ +#line 3913 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1371 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1381 "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) @@ -3900,11 +3921,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3904 "util/configparser.c" /* yacc.c:1646 */ +#line 3925 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1380 "util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1390 "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) @@ -3912,11 +3933,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3916 "util/configparser.c" /* yacc.c:1646 */ +#line 3937 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1389 "util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1399 "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) @@ -3924,11 +3945,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3928 "util/configparser.c" /* yacc.c:1646 */ +#line 3949 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1398 "util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1408 "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) @@ -3936,11 +3957,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3940 "util/configparser.c" /* yacc.c:1646 */ +#line 3961 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1407 "util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1417 "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) @@ -3949,11 +3970,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3953 "util/configparser.c" /* yacc.c:1646 */ +#line 3974 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1417 "util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1427 "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) @@ -3962,11 +3983,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3966 "util/configparser.c" /* yacc.c:1646 */ +#line 3987 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1427 "util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1437 "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) @@ -3976,11 +3997,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3980 "util/configparser.c" /* yacc.c:1646 */ +#line 4001 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1438 "util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1448 "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) @@ -3988,11 +4009,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3992 "util/configparser.c" /* yacc.c:1646 */ +#line 4013 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1447 "util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1457 "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) @@ -4000,11 +4021,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4004 "util/configparser.c" /* yacc.c:1646 */ +#line 4025 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1456 "util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1466 "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) @@ -4016,11 +4037,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4020 "util/configparser.c" /* yacc.c:1646 */ +#line 4041 "util/configparser.c" /* yacc.c:1646 */ break; - case 339: -#line 1469 "util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1479 "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) @@ -4032,11 +4053,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4036 "util/configparser.c" /* yacc.c:1646 */ +#line 4057 "util/configparser.c" /* yacc.c:1646 */ break; - case 340: -#line 1482 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1492 "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) @@ -4044,21 +4065,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4048 "util/configparser.c" /* yacc.c:1646 */ +#line 4069 "util/configparser.c" /* yacc.c:1646 */ break; - case 341: -#line 1491 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1501 "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 4058 "util/configparser.c" /* yacc.c:1646 */ +#line 4079 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1498 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1508 "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) @@ -4066,11 +4087,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4070 "util/configparser.c" /* yacc.c:1646 */ +#line 4091 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1507 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1517 "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) @@ -4078,11 +4099,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4082 "util/configparser.c" /* yacc.c:1646 */ +#line 4103 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1516 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1526 "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) @@ -4090,11 +4111,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4094 "util/configparser.c" /* yacc.c:1646 */ +#line 4115 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1525 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1535 "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) @@ -4103,22 +4124,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4107 "util/configparser.c" /* yacc.c:1646 */ +#line 4128 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1534 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1544 "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 4118 "util/configparser.c" /* yacc.c:1646 */ +#line 4139 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1542 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1552 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4130,22 +4151,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4134 "util/configparser.c" /* yacc.c:1646 */ +#line 4155 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1555 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1565 "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 4145 "util/configparser.c" /* yacc.c:1646 */ +#line 4166 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1563 "util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1573 "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 && @@ -4173,21 +4194,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4177 "util/configparser.c" /* yacc.c:1646 */ +#line 4198 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1592 "util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1602 "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 4187 "util/configparser.c" /* yacc.c:1646 */ +#line 4208 "util/configparser.c" /* yacc.c:1646 */ break; - case 351: -#line 1599 "util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1609 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4201,11 +4222,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4205 "util/configparser.c" /* yacc.c:1646 */ +#line 4226 "util/configparser.c" /* yacc.c:1646 */ break; - case 352: -#line 1614 "util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1624 "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) @@ -4214,11 +4235,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4218 "util/configparser.c" /* yacc.c:1646 */ +#line 4239 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1624 "util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1634 "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) @@ -4227,31 +4248,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4231 "util/configparser.c" /* yacc.c:1646 */ +#line 4252 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1634 "util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1644 "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 4241 "util/configparser.c" /* yacc.c:1646 */ +#line 4262 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1641 "util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1651 "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 4251 "util/configparser.c" /* yacc.c:1646 */ +#line 4272 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1648 "util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1658 "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) @@ -4259,11 +4280,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4263 "util/configparser.c" /* yacc.c:1646 */ +#line 4284 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1657 "util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1667 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4276,11 +4297,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4280 "util/configparser.c" /* yacc.c:1646 */ +#line 4301 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1671 "util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1681 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4298,11 +4319,11 @@ yyreduce: } } } -#line 4302 "util/configparser.c" /* yacc.c:1646 */ +#line 4323 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1690 "util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1700 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4320,11 +4341,11 @@ yyreduce: } } } -#line 4324 "util/configparser.c" /* yacc.c:1646 */ +#line 4345 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1709 "util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1719 "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, @@ -4335,11 +4356,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4339 "util/configparser.c" /* yacc.c:1646 */ +#line 4360 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1721 "util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1731 "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, @@ -4350,11 +4371,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4354 "util/configparser.c" /* yacc.c:1646 */ +#line 4375 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1733 "util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1743 "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, @@ -4365,11 +4386,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4369 "util/configparser.c" /* yacc.c:1646 */ +#line 4390 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1745 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1755 "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, @@ -4379,11 +4400,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4383 "util/configparser.c" /* yacc.c:1646 */ +#line 4404 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1756 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1766 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4401,11 +4422,11 @@ yyreduce: } } } -#line 4405 "util/configparser.c" /* yacc.c:1646 */ +#line 4426 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1775 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1785 "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) @@ -4413,11 +4434,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4417 "util/configparser.c" /* yacc.c:1646 */ +#line 4438 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1785 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1795 "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) @@ -4425,33 +4446,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4429 "util/configparser.c" /* yacc.c:1646 */ +#line 4450 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1794 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1804 "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 4440 "util/configparser.c" /* yacc.c:1646 */ +#line 4461 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1802 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1812 "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 4451 "util/configparser.c" /* yacc.c:1646 */ +#line 4472 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1810 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1820 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4463,11 +4484,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4467 "util/configparser.c" /* yacc.c:1646 */ +#line 4488 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1823 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1833 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4479,11 +4500,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4483 "util/configparser.c" /* yacc.c:1646 */ +#line 4504 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1836 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1846 "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) { @@ -4495,11 +4516,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4499 "util/configparser.c" /* yacc.c:1646 */ +#line 4520 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1849 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1859 "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) { @@ -4511,11 +4532,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4515 "util/configparser.c" /* yacc.c:1646 */ +#line 4536 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1862 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1872 "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) @@ -4523,11 +4544,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4527 "util/configparser.c" /* yacc.c:1646 */ +#line 4548 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1871 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1881 "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) @@ -4535,11 +4556,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4539 "util/configparser.c" /* yacc.c:1646 */ +#line 4560 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1880 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1890 "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) @@ -4547,23 +4568,23 @@ yyreduce: else cfg_parser->cfg->low_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4551 "util/configparser.c" /* yacc.c:1646 */ +#line 4572 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1889 "util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1899 "util/configparser.y" /* yacc.c:1646 */ { - OUTYY(("P(server_low_rtt_pct:%s)\n", (yyvsp[0].str))); + OUTYY(("P(server_low_rtt_permil:%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)); + else cfg_parser->cfg->low_rtt_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4563 "util/configparser.c" /* yacc.c:1646 */ +#line 4584 "util/configparser.c" /* yacc.c:1646 */ break; - case 377: -#line 1898 "util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1908 "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) @@ -4572,11 +4593,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4576 "util/configparser.c" /* yacc.c:1646 */ +#line 4597 "util/configparser.c" /* yacc.c:1646 */ break; - case 378: -#line 1908 "util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1918 "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) @@ -4585,11 +4606,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4589 "util/configparser.c" /* yacc.c:1646 */ +#line 4610 "util/configparser.c" /* yacc.c:1646 */ break; - case 379: -#line 1918 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1928 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4601,11 +4622,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4605 "util/configparser.c" /* yacc.c:1646 */ +#line 4626 "util/configparser.c" /* yacc.c:1646 */ break; - case 380: -#line 1931 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1941 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4617,11 +4638,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4621 "util/configparser.c" /* yacc.c:1646 */ +#line 4642 "util/configparser.c" /* yacc.c:1646 */ break; - case 381: -#line 1944 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1954 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4631,11 +4652,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4635 "util/configparser.c" /* yacc.c:1646 */ +#line 4656 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1955 "util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1965 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -4647,11 +4668,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4651 "util/configparser.c" /* yacc.c:1646 */ +#line 4672 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 1968 "util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1978 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -4661,11 +4682,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4665 "util/configparser.c" /* yacc.c:1646 */ +#line 4686 "util/configparser.c" /* yacc.c:1646 */ break; - case 384: -#line 1979 "util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1989 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -4677,11 +4698,11 @@ yyreduce: OUTYY(("P(Compiled without IPsec module, ignoring)\n")); #endif } -#line 4681 "util/configparser.c" /* yacc.c:1646 */ +#line 4702 "util/configparser.c" /* yacc.c:1646 */ break; - case 385: -#line 1992 "util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 2002 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4690,31 +4711,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4694 "util/configparser.c" /* yacc.c:1646 */ +#line 4715 "util/configparser.c" /* yacc.c:1646 */ break; - case 386: -#line 2002 "util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 2012 "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 4704 "util/configparser.c" /* yacc.c:1646 */ +#line 4725 "util/configparser.c" /* yacc.c:1646 */ break; - case 387: -#line 2009 "util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 2019 "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 4714 "util/configparser.c" /* yacc.c:1646 */ +#line 4735 "util/configparser.c" /* yacc.c:1646 */ break; - case 388: -#line 2016 "util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 2026 "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) @@ -4722,11 +4743,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4726 "util/configparser.c" /* yacc.c:1646 */ +#line 4747 "util/configparser.c" /* yacc.c:1646 */ break; - case 389: -#line 2025 "util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 2035 "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) @@ -4735,11 +4756,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4739 "util/configparser.c" /* yacc.c:1646 */ +#line 4760 "util/configparser.c" /* yacc.c:1646 */ break; - case 390: -#line 2035 "util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 2045 "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) @@ -4748,11 +4769,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4752 "util/configparser.c" /* yacc.c:1646 */ +#line 4773 "util/configparser.c" /* yacc.c:1646 */ break; - case 391: -#line 2045 "util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 2055 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4761,31 +4782,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4765 "util/configparser.c" /* yacc.c:1646 */ +#line 4786 "util/configparser.c" /* yacc.c:1646 */ break; - case 392: -#line 2055 "util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 2065 "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 4775 "util/configparser.c" /* yacc.c:1646 */ +#line 4796 "util/configparser.c" /* yacc.c:1646 */ break; - case 393: -#line 2062 "util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 2072 "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 4785 "util/configparser.c" /* yacc.c:1646 */ +#line 4806 "util/configparser.c" /* yacc.c:1646 */ break; - case 394: -#line 2069 "util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 2079 "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) @@ -4793,11 +4814,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4797 "util/configparser.c" /* yacc.c:1646 */ +#line 4818 "util/configparser.c" /* yacc.c:1646 */ break; - case 395: -#line 2078 "util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 2088 "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) @@ -4806,11 +4827,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4810 "util/configparser.c" /* yacc.c:1646 */ +#line 4831 "util/configparser.c" /* yacc.c:1646 */ break; - case 396: -#line 2088 "util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 2098 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -4819,52 +4840,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 4823 "util/configparser.c" /* yacc.c:1646 */ +#line 4844 "util/configparser.c" /* yacc.c:1646 */ break; - case 397: -#line 2098 "util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 2108 "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 4833 "util/configparser.c" /* yacc.c:1646 */ +#line 4854 "util/configparser.c" /* yacc.c:1646 */ break; - case 398: -#line 2105 "util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 2115 "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 4843 "util/configparser.c" /* yacc.c:1646 */ +#line 4864 "util/configparser.c" /* yacc.c:1646 */ break; - case 399: -#line 2112 "util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 2122 "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 4853 "util/configparser.c" /* yacc.c:1646 */ +#line 4874 "util/configparser.c" /* yacc.c:1646 */ break; - case 400: -#line 2119 "util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 2129 "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 */ +#line 4885 "util/configparser.c" /* yacc.c:1646 */ break; - case 401: -#line 2127 "util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 2137 "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) @@ -4873,11 +4894,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4877 "util/configparser.c" /* yacc.c:1646 */ +#line 4898 "util/configparser.c" /* yacc.c:1646 */ break; - case 402: -#line 2137 "util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 2147 "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) @@ -4886,11 +4907,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4890 "util/configparser.c" /* yacc.c:1646 */ +#line 4911 "util/configparser.c" /* yacc.c:1646 */ break; - case 403: -#line 2147 "util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 2157 "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) @@ -4899,11 +4920,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4903 "util/configparser.c" /* yacc.c:1646 */ +#line 4924 "util/configparser.c" /* yacc.c:1646 */ break; - case 404: -#line 2157 "util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 2167 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4912,11 +4933,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4916 "util/configparser.c" /* yacc.c:1646 */ +#line 4937 "util/configparser.c" /* yacc.c:1646 */ break; - case 405: -#line 2167 "util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 2177 "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 && @@ -4945,11 +4966,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4949 "util/configparser.c" /* yacc.c:1646 */ +#line 4970 "util/configparser.c" /* yacc.c:1646 */ break; - case 406: -#line 2197 "util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 2207 "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)); @@ -4958,22 +4979,22 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 4962 "util/configparser.c" /* yacc.c:1646 */ +#line 4983 "util/configparser.c" /* yacc.c:1646 */ break; - case 407: -#line 2207 "util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 2217 "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 4973 "util/configparser.c" /* yacc.c:1646 */ +#line 4994 "util/configparser.c" /* yacc.c:1646 */ break; - case 408: -#line 2215 "util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 2225 "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))) { @@ -4981,11 +5002,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4985 "util/configparser.c" /* yacc.c:1646 */ +#line 5006 "util/configparser.c" /* yacc.c:1646 */ break; - case 409: -#line 2224 "util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 2234 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4999,11 +5020,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5003 "util/configparser.c" /* yacc.c:1646 */ +#line 5024 "util/configparser.c" /* yacc.c:1646 */ break; - case 410: -#line 2239 "util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2249 "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) @@ -5011,19 +5032,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5015 "util/configparser.c" /* yacc.c:1646 */ +#line 5036 "util/configparser.c" /* yacc.c:1646 */ break; - case 411: -#line 2248 "util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2258 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 5023 "util/configparser.c" /* yacc.c:1646 */ +#line 5044 "util/configparser.c" /* yacc.c:1646 */ break; - case 422: -#line 2259 "util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2269 "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) @@ -5032,11 +5053,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5036 "util/configparser.c" /* yacc.c:1646 */ +#line 5057 "util/configparser.c" /* yacc.c:1646 */ break; - case 423: -#line 2269 "util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2279 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5044,21 +5065,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5048 "util/configparser.c" /* yacc.c:1646 */ +#line 5069 "util/configparser.c" /* yacc.c:1646 */ break; - case 424: -#line 2278 "util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2288 "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 5058 "util/configparser.c" /* yacc.c:1646 */ +#line 5079 "util/configparser.c" /* yacc.c:1646 */ break; - case 425: -#line 2285 "util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2295 "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) @@ -5067,122 +5088,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5071 "util/configparser.c" /* yacc.c:1646 */ +#line 5092 "util/configparser.c" /* yacc.c:1646 */ break; - case 426: -#line 2295 "util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2305 "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 5081 "util/configparser.c" /* yacc.c:1646 */ +#line 5102 "util/configparser.c" /* yacc.c:1646 */ break; - case 427: -#line 2302 "util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2312 "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 5091 "util/configparser.c" /* yacc.c:1646 */ +#line 5112 "util/configparser.c" /* yacc.c:1646 */ break; - case 428: -#line 2309 "util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2319 "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 5101 "util/configparser.c" /* yacc.c:1646 */ +#line 5122 "util/configparser.c" /* yacc.c:1646 */ break; - case 429: -#line 2316 "util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2326 "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 5111 "util/configparser.c" /* yacc.c:1646 */ +#line 5132 "util/configparser.c" /* yacc.c:1646 */ break; - case 430: -#line 2323 "util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2333 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5119 "util/configparser.c" /* yacc.c:1646 */ +#line 5140 "util/configparser.c" /* yacc.c:1646 */ break; - case 445: -#line 2340 "util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2350 "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 5130 "util/configparser.c" /* yacc.c:1646 */ +#line 5151 "util/configparser.c" /* yacc.c:1646 */ break; - case 446: -#line 2348 "util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2358 "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 5140 "util/configparser.c" /* yacc.c:1646 */ +#line 5161 "util/configparser.c" /* yacc.c:1646 */ break; - case 447: -#line 2355 "util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2365 "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 5151 "util/configparser.c" /* yacc.c:1646 */ +#line 5172 "util/configparser.c" /* yacc.c:1646 */ break; - case 448: -#line 2363 "util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2373 "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 5162 "util/configparser.c" /* yacc.c:1646 */ +#line 5183 "util/configparser.c" /* yacc.c:1646 */ break; - case 449: -#line 2371 "util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2381 "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 5172 "util/configparser.c" /* yacc.c:1646 */ +#line 5193 "util/configparser.c" /* yacc.c:1646 */ break; - case 450: -#line 2378 "util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2388 "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 5182 "util/configparser.c" /* yacc.c:1646 */ +#line 5203 "util/configparser.c" /* yacc.c:1646 */ break; - case 451: -#line 2385 "util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2395 "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) @@ -5190,11 +5211,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5194 "util/configparser.c" /* yacc.c:1646 */ +#line 5215 "util/configparser.c" /* yacc.c:1646 */ break; - case 452: -#line 2394 "util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2404 "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) @@ -5202,11 +5223,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5206 "util/configparser.c" /* yacc.c:1646 */ +#line 5227 "util/configparser.c" /* yacc.c:1646 */ break; - case 453: -#line 2403 "util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2413 "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) @@ -5214,11 +5235,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5218 "util/configparser.c" /* yacc.c:1646 */ +#line 5239 "util/configparser.c" /* yacc.c:1646 */ break; - case 454: -#line 2412 "util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2422 "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) @@ -5226,11 +5247,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5230 "util/configparser.c" /* yacc.c:1646 */ +#line 5251 "util/configparser.c" /* yacc.c:1646 */ break; - case 455: -#line 2421 "util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2431 "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) @@ -5238,11 +5259,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5242 "util/configparser.c" /* yacc.c:1646 */ +#line 5263 "util/configparser.c" /* yacc.c:1646 */ break; - case 456: -#line 2430 "util/configparser.y" /* yacc.c:1646 */ + case 458: +#line 2440 "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) @@ -5250,29 +5271,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 5254 "util/configparser.c" /* yacc.c:1646 */ +#line 5275 "util/configparser.c" /* yacc.c:1646 */ break; - case 457: -#line 2439 "util/configparser.y" /* yacc.c:1646 */ + case 459: +#line 2449 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 5262 "util/configparser.c" /* yacc.c:1646 */ +#line 5283 "util/configparser.c" /* yacc.c:1646 */ break; - case 461: -#line 2448 "util/configparser.y" /* yacc.c:1646 */ + case 463: +#line 2458 "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 5272 "util/configparser.c" /* yacc.c:1646 */ +#line 5293 "util/configparser.c" /* yacc.c:1646 */ break; - case 462: -#line 2454 "util/configparser.y" /* yacc.c:1646 */ + case 464: +#line 2464 "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) @@ -5281,21 +5302,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5285 "util/configparser.c" /* yacc.c:1646 */ +#line 5306 "util/configparser.c" /* yacc.c:1646 */ break; - case 463: -#line 2464 "util/configparser.y" /* yacc.c:1646 */ + case 465: +#line 2474 "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 5295 "util/configparser.c" /* yacc.c:1646 */ +#line 5316 "util/configparser.c" /* yacc.c:1646 */ break; - case 464: -#line 2471 "util/configparser.y" /* yacc.c:1646 */ + case 466: +#line 2481 "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)); @@ -5303,31 +5324,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5307 "util/configparser.c" /* yacc.c:1646 */ +#line 5328 "util/configparser.c" /* yacc.c:1646 */ break; - case 465: -#line 2480 "util/configparser.y" /* yacc.c:1646 */ + case 467: +#line 2490 "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 5318 "util/configparser.c" /* yacc.c:1646 */ +#line 5339 "util/configparser.c" /* yacc.c:1646 */ break; - case 466: -#line 2488 "util/configparser.y" /* yacc.c:1646 */ + case 468: +#line 2498 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnscrypt:)\n")); OUTYY(("\nP(dnscrypt:)\n")); } -#line 5327 "util/configparser.c" /* yacc.c:1646 */ +#line 5348 "util/configparser.c" /* yacc.c:1646 */ break; - case 479: -#line 2505 "util/configparser.y" /* yacc.c:1646 */ + case 481: +#line 2515 "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) @@ -5335,11 +5356,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5339 "util/configparser.c" /* yacc.c:1646 */ +#line 5360 "util/configparser.c" /* yacc.c:1646 */ break; - case 480: -#line 2515 "util/configparser.y" /* yacc.c:1646 */ + case 482: +#line 2525 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); @@ -5348,21 +5369,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5352 "util/configparser.c" /* yacc.c:1646 */ +#line 5373 "util/configparser.c" /* yacc.c:1646 */ break; - case 481: -#line 2525 "util/configparser.y" /* yacc.c:1646 */ + case 483: +#line 2535 "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 5362 "util/configparser.c" /* yacc.c:1646 */ +#line 5383 "util/configparser.c" /* yacc.c:1646 */ break; - case 482: -#line 2532 "util/configparser.y" /* yacc.c:1646 */ + case 484: +#line 2542 "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))) @@ -5370,21 +5391,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 5374 "util/configparser.c" /* yacc.c:1646 */ +#line 5395 "util/configparser.c" /* yacc.c:1646 */ break; - case 483: -#line 2541 "util/configparser.y" /* yacc.c:1646 */ + case 485: +#line 2551 "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 5384 "util/configparser.c" /* yacc.c:1646 */ +#line 5405 "util/configparser.c" /* yacc.c:1646 */ break; - case 484: -#line 2548 "util/configparser.y" /* yacc.c:1646 */ + case 486: +#line 2558 "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))) @@ -5392,22 +5413,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 5396 "util/configparser.c" /* yacc.c:1646 */ +#line 5417 "util/configparser.c" /* yacc.c:1646 */ break; - case 485: -#line 2557 "util/configparser.y" /* yacc.c:1646 */ + case 487: +#line 2567 "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 5407 "util/configparser.c" /* yacc.c:1646 */ +#line 5428 "util/configparser.c" /* yacc.c:1646 */ break; - case 486: -#line 2565 "util/configparser.y" /* yacc.c:1646 */ + case 488: +#line 2575 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5419,22 +5440,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5423 "util/configparser.c" /* yacc.c:1646 */ +#line 5444 "util/configparser.c" /* yacc.c:1646 */ break; - case 487: -#line 2578 "util/configparser.y" /* yacc.c:1646 */ + case 489: +#line 2588 "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 5434 "util/configparser.c" /* yacc.c:1646 */ +#line 5455 "util/configparser.c" /* yacc.c:1646 */ break; - case 488: -#line 2586 "util/configparser.y" /* yacc.c:1646 */ + case 490: +#line 2596 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5446,19 +5467,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5450 "util/configparser.c" /* yacc.c:1646 */ +#line 5471 "util/configparser.c" /* yacc.c:1646 */ break; - case 489: -#line 2599 "util/configparser.y" /* yacc.c:1646 */ + case 491: +#line 2609 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(cachedb:)\n")); } -#line 5458 "util/configparser.c" /* yacc.c:1646 */ +#line 5479 "util/configparser.c" /* yacc.c:1646 */ break; - case 497: -#line 2609 "util/configparser.y" /* yacc.c:1646 */ + case 499: +#line 2619 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5471,11 +5492,11 @@ yyreduce: OUTYY(("P(Compiled without cachedb, ignoring)\n")); #endif } -#line 5475 "util/configparser.c" /* yacc.c:1646 */ +#line 5496 "util/configparser.c" /* yacc.c:1646 */ break; - case 498: -#line 2623 "util/configparser.y" /* yacc.c:1646 */ + case 500: +#line 2633 "util/configparser.y" /* yacc.c:1646 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5489,11 +5510,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5493 "util/configparser.c" /* yacc.c:1646 */ +#line 5514 "util/configparser.c" /* yacc.c:1646 */ break; - case 499: -#line 2638 "util/configparser.y" /* yacc.c:1646 */ + case 501: +#line 2648 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -5504,11 +5525,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5508 "util/configparser.c" /* yacc.c:1646 */ +#line 5529 "util/configparser.c" /* yacc.c:1646 */ break; - case 500: -#line 2650 "util/configparser.y" /* yacc.c:1646 */ + case 502: +#line 2660 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -5522,11 +5543,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5526 "util/configparser.c" /* yacc.c:1646 */ +#line 5547 "util/configparser.c" /* yacc.c:1646 */ break; - case 501: -#line 2665 "util/configparser.y" /* yacc.c:1646 */ + case 503: +#line 2675 "util/configparser.y" /* yacc.c:1646 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -5538,11 +5559,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5542 "util/configparser.c" /* yacc.c:1646 */ +#line 5563 "util/configparser.c" /* yacc.c:1646 */ break; -#line 5546 "util/configparser.c" /* yacc.c:1646 */ +#line 5567 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5770,7 +5791,7 @@ yyreturn: #endif return yyresult; } -#line 2677 "util/configparser.y" /* yacc.c:1906 */ +#line 2687 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |