diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-12 11:49:30 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2018-05-12 11:49:30 +0000 |
commit | fbdb9ac866a647da0919b224f05cca039afc02fa (patch) | |
tree | a4ddb15b51a795c9f985e693a04d992a94f4f455 /util/configparser.c | |
parent | 31f8d531e1359c7acd82cff9ab798cdeac277adc (diff) |
Diffstat (limited to 'util/configparser.c')
-rw-r--r-- | util/configparser.c | 2063 |
1 files changed, 1085 insertions, 978 deletions
diff --git a/util/configparser.c b/util/configparser.c index 9ceed14bc6990..e9654f95fb9df 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -247,64 +247,70 @@ extern int yydebug; VAR_HARDEN_BELOW_NXDOMAIN = 378, VAR_IGNORE_CD_FLAG = 379, VAR_LOG_QUERIES = 380, - VAR_TCP_UPSTREAM = 381, - VAR_SSL_UPSTREAM = 382, - VAR_SSL_SERVICE_KEY = 383, - VAR_SSL_SERVICE_PEM = 384, - VAR_SSL_PORT = 385, - VAR_FORWARD_FIRST = 386, - VAR_STUB_SSL_UPSTREAM = 387, - VAR_FORWARD_SSL_UPSTREAM = 388, - VAR_STUB_FIRST = 389, - VAR_MINIMAL_RESPONSES = 390, - VAR_RRSET_ROUNDROBIN = 391, - VAR_MAX_UDP_SIZE = 392, - VAR_DELAY_CLOSE = 393, - VAR_UNBLOCK_LAN_ZONES = 394, - VAR_INSECURE_LAN_ZONES = 395, - VAR_INFRA_CACHE_MIN_RTT = 396, - VAR_DNS64_PREFIX = 397, - VAR_DNS64_SYNTHALL = 398, - VAR_DNSTAP = 399, - VAR_DNSTAP_ENABLE = 400, - VAR_DNSTAP_SOCKET_PATH = 401, - VAR_DNSTAP_SEND_IDENTITY = 402, - VAR_DNSTAP_SEND_VERSION = 403, - VAR_DNSTAP_IDENTITY = 404, - VAR_DNSTAP_VERSION = 405, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 406, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 407, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 408, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 409, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 410, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 411, - VAR_HARDEN_ALGO_DOWNGRADE = 412, - VAR_IP_TRANSPARENT = 413, - VAR_DISABLE_DNSSEC_LAME_CHECK = 414, - VAR_RATELIMIT = 415, - VAR_RATELIMIT_SLABS = 416, - VAR_RATELIMIT_SIZE = 417, - VAR_RATELIMIT_FOR_DOMAIN = 418, - VAR_RATELIMIT_BELOW_DOMAIN = 419, - VAR_RATELIMIT_FACTOR = 420, - VAR_CAPS_WHITELIST = 421, - VAR_CACHE_MAX_NEGATIVE_TTL = 422, - VAR_PERMIT_SMALL_HOLDDOWN = 423, - VAR_QNAME_MINIMISATION = 424, - VAR_QNAME_MINIMISATION_STRICT = 425, - VAR_IP_FREEBIND = 426, - VAR_DEFINE_TAG = 427, - VAR_LOCAL_ZONE_TAG = 428, - VAR_ACCESS_CONTROL_TAG = 429, - VAR_LOCAL_ZONE_OVERRIDE = 430, - VAR_ACCESS_CONTROL_TAG_ACTION = 431, - VAR_ACCESS_CONTROL_TAG_DATA = 432, - VAR_VIEW = 433, - VAR_ACCESS_CONTROL_VIEW = 434, - VAR_VIEW_FIRST = 435, - VAR_SERVE_EXPIRED = 436, - VAR_FAKE_DSA = 437, - VAR_LOG_IDENTITY = 438 + VAR_LOG_REPLIES = 381, + VAR_TCP_UPSTREAM = 382, + VAR_SSL_UPSTREAM = 383, + VAR_SSL_SERVICE_KEY = 384, + VAR_SSL_SERVICE_PEM = 385, + VAR_SSL_PORT = 386, + VAR_FORWARD_FIRST = 387, + VAR_STUB_SSL_UPSTREAM = 388, + VAR_FORWARD_SSL_UPSTREAM = 389, + VAR_STUB_FIRST = 390, + VAR_MINIMAL_RESPONSES = 391, + VAR_RRSET_ROUNDROBIN = 392, + VAR_MAX_UDP_SIZE = 393, + VAR_DELAY_CLOSE = 394, + VAR_UNBLOCK_LAN_ZONES = 395, + VAR_INSECURE_LAN_ZONES = 396, + VAR_INFRA_CACHE_MIN_RTT = 397, + VAR_DNS64_PREFIX = 398, + VAR_DNS64_SYNTHALL = 399, + VAR_DNSTAP = 400, + VAR_DNSTAP_ENABLE = 401, + VAR_DNSTAP_SOCKET_PATH = 402, + VAR_DNSTAP_SEND_IDENTITY = 403, + VAR_DNSTAP_SEND_VERSION = 404, + VAR_DNSTAP_IDENTITY = 405, + VAR_DNSTAP_VERSION = 406, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 407, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 408, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 409, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 410, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 411, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 412, + VAR_HARDEN_ALGO_DOWNGRADE = 413, + VAR_IP_TRANSPARENT = 414, + VAR_DISABLE_DNSSEC_LAME_CHECK = 415, + VAR_IP_RATELIMIT = 416, + VAR_IP_RATELIMIT_SLABS = 417, + VAR_IP_RATELIMIT_SIZE = 418, + VAR_RATELIMIT = 419, + VAR_RATELIMIT_SLABS = 420, + VAR_RATELIMIT_SIZE = 421, + VAR_RATELIMIT_FOR_DOMAIN = 422, + VAR_RATELIMIT_BELOW_DOMAIN = 423, + VAR_IP_RATELIMIT_FACTOR = 424, + VAR_RATELIMIT_FACTOR = 425, + VAR_CAPS_WHITELIST = 426, + VAR_CACHE_MAX_NEGATIVE_TTL = 427, + VAR_PERMIT_SMALL_HOLDDOWN = 428, + VAR_QNAME_MINIMISATION = 429, + VAR_QNAME_MINIMISATION_STRICT = 430, + VAR_IP_FREEBIND = 431, + VAR_DEFINE_TAG = 432, + VAR_LOCAL_ZONE_TAG = 433, + VAR_ACCESS_CONTROL_TAG = 434, + VAR_LOCAL_ZONE_OVERRIDE = 435, + VAR_ACCESS_CONTROL_TAG_ACTION = 436, + VAR_ACCESS_CONTROL_TAG_DATA = 437, + VAR_VIEW = 438, + VAR_ACCESS_CONTROL_VIEW = 439, + VAR_VIEW_FIRST = 440, + VAR_SERVE_EXPIRED = 441, + VAR_FAKE_DSA = 442, + VAR_LOG_IDENTITY = 443, + VAR_USE_SYSTEMD = 444 }; #endif /* Tokens. */ @@ -431,64 +437,70 @@ extern int yydebug; #define VAR_HARDEN_BELOW_NXDOMAIN 378 #define VAR_IGNORE_CD_FLAG 379 #define VAR_LOG_QUERIES 380 -#define VAR_TCP_UPSTREAM 381 -#define VAR_SSL_UPSTREAM 382 -#define VAR_SSL_SERVICE_KEY 383 -#define VAR_SSL_SERVICE_PEM 384 -#define VAR_SSL_PORT 385 -#define VAR_FORWARD_FIRST 386 -#define VAR_STUB_SSL_UPSTREAM 387 -#define VAR_FORWARD_SSL_UPSTREAM 388 -#define VAR_STUB_FIRST 389 -#define VAR_MINIMAL_RESPONSES 390 -#define VAR_RRSET_ROUNDROBIN 391 -#define VAR_MAX_UDP_SIZE 392 -#define VAR_DELAY_CLOSE 393 -#define VAR_UNBLOCK_LAN_ZONES 394 -#define VAR_INSECURE_LAN_ZONES 395 -#define VAR_INFRA_CACHE_MIN_RTT 396 -#define VAR_DNS64_PREFIX 397 -#define VAR_DNS64_SYNTHALL 398 -#define VAR_DNSTAP 399 -#define VAR_DNSTAP_ENABLE 400 -#define VAR_DNSTAP_SOCKET_PATH 401 -#define VAR_DNSTAP_SEND_IDENTITY 402 -#define VAR_DNSTAP_SEND_VERSION 403 -#define VAR_DNSTAP_IDENTITY 404 -#define VAR_DNSTAP_VERSION 405 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 406 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 407 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 408 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 409 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 410 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 411 -#define VAR_HARDEN_ALGO_DOWNGRADE 412 -#define VAR_IP_TRANSPARENT 413 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 414 -#define VAR_RATELIMIT 415 -#define VAR_RATELIMIT_SLABS 416 -#define VAR_RATELIMIT_SIZE 417 -#define VAR_RATELIMIT_FOR_DOMAIN 418 -#define VAR_RATELIMIT_BELOW_DOMAIN 419 -#define VAR_RATELIMIT_FACTOR 420 -#define VAR_CAPS_WHITELIST 421 -#define VAR_CACHE_MAX_NEGATIVE_TTL 422 -#define VAR_PERMIT_SMALL_HOLDDOWN 423 -#define VAR_QNAME_MINIMISATION 424 -#define VAR_QNAME_MINIMISATION_STRICT 425 -#define VAR_IP_FREEBIND 426 -#define VAR_DEFINE_TAG 427 -#define VAR_LOCAL_ZONE_TAG 428 -#define VAR_ACCESS_CONTROL_TAG 429 -#define VAR_LOCAL_ZONE_OVERRIDE 430 -#define VAR_ACCESS_CONTROL_TAG_ACTION 431 -#define VAR_ACCESS_CONTROL_TAG_DATA 432 -#define VAR_VIEW 433 -#define VAR_ACCESS_CONTROL_VIEW 434 -#define VAR_VIEW_FIRST 435 -#define VAR_SERVE_EXPIRED 436 -#define VAR_FAKE_DSA 437 -#define VAR_LOG_IDENTITY 438 +#define VAR_LOG_REPLIES 381 +#define VAR_TCP_UPSTREAM 382 +#define VAR_SSL_UPSTREAM 383 +#define VAR_SSL_SERVICE_KEY 384 +#define VAR_SSL_SERVICE_PEM 385 +#define VAR_SSL_PORT 386 +#define VAR_FORWARD_FIRST 387 +#define VAR_STUB_SSL_UPSTREAM 388 +#define VAR_FORWARD_SSL_UPSTREAM 389 +#define VAR_STUB_FIRST 390 +#define VAR_MINIMAL_RESPONSES 391 +#define VAR_RRSET_ROUNDROBIN 392 +#define VAR_MAX_UDP_SIZE 393 +#define VAR_DELAY_CLOSE 394 +#define VAR_UNBLOCK_LAN_ZONES 395 +#define VAR_INSECURE_LAN_ZONES 396 +#define VAR_INFRA_CACHE_MIN_RTT 397 +#define VAR_DNS64_PREFIX 398 +#define VAR_DNS64_SYNTHALL 399 +#define VAR_DNSTAP 400 +#define VAR_DNSTAP_ENABLE 401 +#define VAR_DNSTAP_SOCKET_PATH 402 +#define VAR_DNSTAP_SEND_IDENTITY 403 +#define VAR_DNSTAP_SEND_VERSION 404 +#define VAR_DNSTAP_IDENTITY 405 +#define VAR_DNSTAP_VERSION 406 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 407 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 408 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 409 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 410 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 411 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 412 +#define VAR_HARDEN_ALGO_DOWNGRADE 413 +#define VAR_IP_TRANSPARENT 414 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 415 +#define VAR_IP_RATELIMIT 416 +#define VAR_IP_RATELIMIT_SLABS 417 +#define VAR_IP_RATELIMIT_SIZE 418 +#define VAR_RATELIMIT 419 +#define VAR_RATELIMIT_SLABS 420 +#define VAR_RATELIMIT_SIZE 421 +#define VAR_RATELIMIT_FOR_DOMAIN 422 +#define VAR_RATELIMIT_BELOW_DOMAIN 423 +#define VAR_IP_RATELIMIT_FACTOR 424 +#define VAR_RATELIMIT_FACTOR 425 +#define VAR_CAPS_WHITELIST 426 +#define VAR_CACHE_MAX_NEGATIVE_TTL 427 +#define VAR_PERMIT_SMALL_HOLDDOWN 428 +#define VAR_QNAME_MINIMISATION 429 +#define VAR_QNAME_MINIMISATION_STRICT 430 +#define VAR_IP_FREEBIND 431 +#define VAR_DEFINE_TAG 432 +#define VAR_LOCAL_ZONE_TAG 433 +#define VAR_ACCESS_CONTROL_TAG 434 +#define VAR_LOCAL_ZONE_OVERRIDE 435 +#define VAR_ACCESS_CONTROL_TAG_ACTION 436 +#define VAR_ACCESS_CONTROL_TAG_DATA 437 +#define VAR_VIEW 438 +#define VAR_ACCESS_CONTROL_VIEW 439 +#define VAR_VIEW_FIRST 440 +#define VAR_SERVE_EXPIRED 441 +#define VAR_FAKE_DSA 442 +#define VAR_LOG_IDENTITY 443 +#define VAR_USE_SYSTEMD 444 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -499,7 +511,7 @@ union YYSTYPE char* str; -#line 503 "util/configparser.c" /* yacc.c:355 */ +#line 515 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -516,7 +528,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 520 "util/configparser.c" /* yacc.c:358 */ +#line 532 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -758,21 +770,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 363 +#define YYLAST 375 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 184 +#define YYNTOKENS 190 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 194 +#define YYNNTS 200 /* YYNRULES -- Number of rules. */ -#define YYNRULES 371 +#define YYNRULES 383 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 556 +#define YYNSTATES 574 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 438 +#define YYMAXUTOK 444 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -824,51 +836,53 @@ static const yytype_uint8 yytranslate[] = 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, 179, 180, 181, 182, 183 + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 137, 137, 137, 138, 138, 139, 139, 140, 140, - 140, 145, 150, 151, 152, 152, 152, 153, 153, 154, - 154, 155, 155, 156, 156, 157, 157, 157, 158, 158, - 158, 159, 159, 160, 160, 161, 161, 162, 162, 163, - 163, 164, 164, 165, 165, 166, 166, 167, 167, 167, - 168, 168, 168, 169, 169, 169, 170, 170, 171, 171, - 172, 172, 173, 173, 174, 174, 174, 175, 175, 176, - 176, 177, 177, 177, 178, 178, 179, 179, 180, 180, - 181, 181, 181, 182, 182, 183, 183, 184, 184, 185, - 185, 186, 186, 187, 187, 187, 188, 188, 189, 189, - 189, 190, 190, 190, 191, 191, 191, 192, 192, 192, - 193, 193, 193, 194, 194, 194, 195, 195, 196, 196, - 197, 197, 198, 198, 199, 199, 199, 200, 200, 201, - 201, 202, 202, 203, 203, 204, 204, 204, 205, 205, - 206, 206, 207, 207, 208, 208, 209, 209, 211, 223, - 224, 225, 225, 225, 225, 225, 226, 228, 240, 241, - 242, 242, 242, 242, 243, 245, 259, 260, 261, 261, - 261, 261, 263, 272, 281, 292, 301, 310, 319, 332, - 347, 356, 365, 374, 383, 392, 401, 410, 419, 428, - 437, 446, 455, 464, 473, 482, 489, 496, 505, 514, - 528, 537, 546, 553, 560, 584, 592, 599, 606, 613, - 620, 628, 636, 644, 651, 658, 667, 676, 683, 690, - 698, 706, 716, 726, 736, 749, 760, 768, 781, 790, - 799, 808, 818, 828, 836, 849, 858, 866, 875, 883, - 896, 905, 912, 922, 932, 942, 952, 962, 972, 982, - 992, 999, 1006, 1013, 1022, 1031, 1040, 1047, 1057, 1074, - 1081, 1099, 1112, 1125, 1134, 1143, 1152, 1161, 1171, 1181, - 1190, 1199, 1210, 1219, 1226, 1235, 1244, 1253, 1262, 1270, - 1283, 1291, 1319, 1326, 1341, 1351, 1361, 1368, 1375, 1384, - 1398, 1417, 1436, 1448, 1460, 1472, 1483, 1492, 1500, 1513, - 1526, 1539, 1548, 1558, 1568, 1578, 1585, 1592, 1601, 1611, - 1621, 1631, 1638, 1645, 1654, 1664, 1674, 1703, 1712, 1721, - 1726, 1727, 1728, 1728, 1728, 1729, 1729, 1729, 1730, 1730, - 1732, 1742, 1751, 1758, 1768, 1775, 1782, 1789, 1796, 1801, - 1802, 1803, 1803, 1804, 1804, 1805, 1805, 1806, 1807, 1808, - 1809, 1810, 1811, 1813, 1821, 1828, 1836, 1844, 1851, 1858, - 1867, 1876, 1885, 1894, 1903, 1912, 1917, 1918, 1919, 1921, - 1927, 1937 + 0, 141, 141, 141, 142, 142, 143, 143, 144, 144, + 144, 149, 154, 155, 156, 156, 156, 157, 157, 158, + 158, 159, 159, 160, 160, 161, 161, 161, 162, 162, + 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, + 167, 168, 168, 169, 169, 170, 170, 171, 171, 171, + 172, 172, 172, 173, 173, 173, 174, 174, 175, 175, + 176, 176, 177, 177, 178, 178, 178, 179, 179, 180, + 180, 181, 181, 181, 182, 182, 183, 183, 184, 184, + 185, 185, 185, 186, 186, 187, 187, 188, 188, 189, + 189, 190, 190, 191, 191, 191, 192, 192, 193, 193, + 193, 194, 194, 194, 195, 195, 195, 196, 196, 196, + 196, 197, 197, 197, 198, 198, 198, 199, 199, 200, + 200, 201, 201, 202, 202, 203, 203, 203, 204, 204, + 205, 205, 206, 207, 207, 208, 209, 209, 210, 210, + 211, 211, 211, 212, 212, 213, 213, 214, 214, 215, + 215, 216, 216, 216, 218, 230, 231, 232, 232, 232, + 232, 232, 233, 235, 247, 248, 249, 249, 249, 249, + 250, 252, 266, 267, 268, 268, 268, 268, 270, 279, + 288, 299, 308, 317, 326, 339, 354, 363, 372, 381, + 390, 399, 408, 417, 426, 435, 444, 453, 462, 471, + 480, 489, 496, 503, 512, 521, 530, 544, 553, 562, + 571, 578, 585, 611, 619, 626, 633, 640, 647, 655, + 663, 671, 678, 685, 694, 703, 710, 717, 725, 733, + 743, 753, 763, 776, 787, 795, 808, 817, 826, 835, + 845, 855, 863, 876, 885, 893, 902, 910, 923, 932, + 939, 949, 959, 969, 979, 989, 999, 1009, 1019, 1026, + 1033, 1040, 1049, 1058, 1067, 1074, 1084, 1101, 1108, 1126, + 1139, 1152, 1161, 1170, 1179, 1188, 1198, 1208, 1217, 1226, + 1239, 1248, 1255, 1264, 1273, 1282, 1291, 1299, 1312, 1320, + 1348, 1355, 1370, 1380, 1390, 1397, 1404, 1413, 1427, 1446, + 1465, 1477, 1489, 1501, 1512, 1522, 1531, 1539, 1547, 1560, + 1573, 1586, 1599, 1608, 1617, 1627, 1637, 1647, 1654, 1661, + 1670, 1680, 1690, 1700, 1707, 1714, 1723, 1733, 1743, 1772, + 1781, 1790, 1795, 1796, 1797, 1797, 1797, 1798, 1798, 1798, + 1799, 1799, 1801, 1811, 1820, 1827, 1837, 1844, 1851, 1858, + 1865, 1870, 1871, 1872, 1872, 1873, 1873, 1874, 1874, 1875, + 1876, 1877, 1878, 1879, 1880, 1882, 1890, 1897, 1905, 1913, + 1920, 1927, 1936, 1945, 1954, 1963, 1972, 1981, 1986, 1987, + 1988, 1990, 1996, 2006 }; #endif @@ -916,15 +930,15 @@ static const char *const yytname[] = "VAR_SO_RCVBUF", "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH", "VAR_PREFETCH_KEY", "VAR_SO_SNDBUF", "VAR_SO_REUSEPORT", "VAR_HARDEN_BELOW_NXDOMAIN", "VAR_IGNORE_CD_FLAG", "VAR_LOG_QUERIES", - "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM", "VAR_SSL_SERVICE_KEY", - "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", "VAR_FORWARD_FIRST", - "VAR_STUB_SSL_UPSTREAM", "VAR_FORWARD_SSL_UPSTREAM", "VAR_STUB_FIRST", - "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", - "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", - "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", - "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", - "VAR_DNSTAP_SEND_IDENTITY", "VAR_DNSTAP_SEND_VERSION", - "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", + "VAR_LOG_REPLIES", "VAR_TCP_UPSTREAM", "VAR_SSL_UPSTREAM", + "VAR_SSL_SERVICE_KEY", "VAR_SSL_SERVICE_PEM", "VAR_SSL_PORT", + "VAR_FORWARD_FIRST", "VAR_STUB_SSL_UPSTREAM", "VAR_FORWARD_SSL_UPSTREAM", + "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", + "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", "VAR_UNBLOCK_LAN_ZONES", + "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", + "VAR_DNS64_SYNTHALL", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", + "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_SEND_IDENTITY", + "VAR_DNSTAP_SEND_VERSION", "VAR_DNSTAP_IDENTITY", "VAR_DNSTAP_VERSION", "VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES", "VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES", "VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES", @@ -932,17 +946,19 @@ static const char *const yytname[] = "VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES", "VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES", "VAR_HARDEN_ALGO_DOWNGRADE", "VAR_IP_TRANSPARENT", - "VAR_DISABLE_DNSSEC_LAME_CHECK", "VAR_RATELIMIT", "VAR_RATELIMIT_SLABS", - "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN", - "VAR_RATELIMIT_BELOW_DOMAIN", "VAR_RATELIMIT_FACTOR", - "VAR_CAPS_WHITELIST", "VAR_CACHE_MAX_NEGATIVE_TTL", - "VAR_PERMIT_SMALL_HOLDDOWN", "VAR_QNAME_MINIMISATION", - "VAR_QNAME_MINIMISATION_STRICT", "VAR_IP_FREEBIND", "VAR_DEFINE_TAG", - "VAR_LOCAL_ZONE_TAG", "VAR_ACCESS_CONTROL_TAG", - "VAR_LOCAL_ZONE_OVERRIDE", "VAR_ACCESS_CONTROL_TAG_ACTION", - "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", - "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", - "VAR_LOG_IDENTITY", "$accept", "toplevelvars", "toplevelvar", + "VAR_DISABLE_DNSSEC_LAME_CHECK", "VAR_IP_RATELIMIT", + "VAR_IP_RATELIMIT_SLABS", "VAR_IP_RATELIMIT_SIZE", "VAR_RATELIMIT", + "VAR_RATELIMIT_SLABS", "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN", + "VAR_RATELIMIT_BELOW_DOMAIN", "VAR_IP_RATELIMIT_FACTOR", + "VAR_RATELIMIT_FACTOR", "VAR_CAPS_WHITELIST", + "VAR_CACHE_MAX_NEGATIVE_TTL", "VAR_PERMIT_SMALL_HOLDDOWN", + "VAR_QNAME_MINIMISATION", "VAR_QNAME_MINIMISATION_STRICT", + "VAR_IP_FREEBIND", "VAR_DEFINE_TAG", "VAR_LOCAL_ZONE_TAG", + "VAR_ACCESS_CONTROL_TAG", "VAR_LOCAL_ZONE_OVERRIDE", + "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", + "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST", + "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_LOG_IDENTITY", + "VAR_USE_SYSTEMD", "$accept", "toplevelvars", "toplevelvar", "serverstart", "contents_server", "content_server", "stubstart", "contents_stub", "content_stub", "forwardstart", "contents_forward", "content_forward", "viewstart", "contents_view", "content_view", @@ -955,9 +971,10 @@ static const char *const yytname[] = "server_do_ip6", "server_do_udp", "server_do_tcp", "server_prefer_ip6", "server_tcp_mss", "server_outgoing_tcp_mss", "server_tcp_upstream", "server_ssl_upstream", "server_ssl_service_key", - "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize", - "server_use_syslog", "server_log_time_ascii", "server_log_queries", - "server_chroot", "server_username", "server_directory", "server_logfile", + "server_ssl_service_pem", "server_ssl_port", "server_use_systemd", + "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", + "server_log_queries", "server_log_replies", "server_chroot", + "server_username", "server_directory", "server_logfile", "server_pidfile", "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", "server_auto_trust_anchor_file", "server_trust_anchor_file", "server_trusted_keys_file", @@ -997,14 +1014,15 @@ static const char *const yytname[] = "server_dns64_synthall", "server_define_tag", "server_local_zone_tag", "server_access_control_tag", "server_access_control_tag_action", "server_access_control_tag_data", "server_local_zone_override", - "server_access_control_view", "server_ratelimit", - "server_ratelimit_size", "server_ratelimit_slabs", + "server_access_control_view", "server_ip_ratelimit", "server_ratelimit", + "server_ip_ratelimit_size", "server_ratelimit_size", + "server_ip_ratelimit_slabs", "server_ratelimit_slabs", "server_ratelimit_for_domain", "server_ratelimit_below_domain", - "server_ratelimit_factor", "server_qname_minimisation", - "server_qname_minimisation_strict", "stub_name", "stub_host", - "stub_addr", "stub_first", "stub_ssl_upstream", "stub_prime", - "forward_name", "forward_host", "forward_addr", "forward_first", - "forward_ssl_upstream", "view_name", "view_local_zone", + "server_ip_ratelimit_factor", "server_ratelimit_factor", + "server_qname_minimisation", "server_qname_minimisation_strict", + "stub_name", "stub_host", "stub_addr", "stub_first", "stub_ssl_upstream", + "stub_prime", "forward_name", "forward_host", "forward_addr", + "forward_first", "forward_ssl_upstream", "view_name", "view_local_zone", "view_local_data", "view_first", "rcstart", "contents_rc", "content_rc", "rc_control_enable", "rc_control_port", "rc_control_interface", "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file", @@ -1046,14 +1064,14 @@ static const yytype_uint16 yytoknum[] = 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 438 + 435, 436, 437, 438, 439, 440, 441, 442, 443, 444 }; # endif -#define YYPACT_NINF -130 +#define YYPACT_NINF -132 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-130))) + (!!((Yystate) == (-132))) #define YYTABLE_NINF -1 @@ -1064,62 +1082,64 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -130, 0, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, 135, -38, - -34, -39, -64, -129, -105, -3, -2, -1, 2, 3, - 26, 29, 30, 32, 33, 34, 35, 36, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 56, 57, 58, 59, 60, + -132, 0, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, 134, -39, + -35, -11, -62, -131, -106, -4, -3, -2, -1, 2, + 17, 18, 28, 29, 30, 32, 33, 34, 35, 36, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 83, 85, 88, 90, 91, 92, 93, 94, 95, 96, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 132, 133, 136, 165, 166, 167, - 172, 173, 174, 216, 217, 218, 219, 220, 221, 222, - 223, 224, 228, 232, 233, 256, 257, 258, 259, 269, - 270, 271, 272, 273, 274, 275, 276, 277, 278, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, 279, 280, 281, 303, 305, 309, - -130, -130, -130, -130, -130, -130, -130, 310, 311, 312, - 313, 314, -130, -130, -130, -130, -130, -130, 315, 316, - 317, 318, -130, -130, -130, -130, -130, 319, 320, 321, - 322, 323, 324, 325, 326, -130, -130, -130, -130, -130, - -130, -130, -130, -130, 327, 328, 329, 330, 331, 332, - 333, 334, 335, 336, 337, 338, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, 339, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, 340, 341, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, 342, 343, -130, - -130, -130, -130, -130, -130, -130, -130, 344, 345, 346, - 347, 348, 349, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, 350, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, 351, 352, - 353, -130, -130, -130, -130, -130 + 127, 128, 129, 130, 131, 132, 133, 165, 166, 167, + 171, 172, 215, 216, 217, 218, 219, 220, 221, 222, + 223, 227, 231, 232, 256, 257, 258, 259, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, + 281, 307, 309, 314, 315, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, 316, 317, 318, 319, + 320, 321, -132, -132, -132, -132, -132, -132, -132, 322, + 323, 324, 325, 326, -132, -132, -132, -132, -132, -132, + 327, 328, 329, 330, -132, -132, -132, -132, -132, 331, + 332, 333, 334, 335, 336, 337, 338, -132, -132, -132, + -132, -132, -132, -132, -132, -132, 339, 340, 341, 342, + 343, 344, 345, 346, 347, 348, 349, 350, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, 351, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + 352, 353, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, 354, 355, -132, -132, -132, -132, -132, + -132, -132, -132, -132, 356, 357, 358, 359, 360, 361, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, 362, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, 363, 364, 365, -132, + -132, -132, -132, -132 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1127,8 +1147,8 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 11, 148, 157, 319, 365, 338, 165, - 3, 13, 150, 159, 167, 321, 340, 367, 4, 5, + 2, 0, 1, 11, 154, 163, 331, 377, 350, 171, + 3, 13, 156, 165, 173, 333, 352, 379, 4, 5, 6, 10, 8, 9, 7, 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, @@ -1142,97 +1162,99 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, - 14, 15, 74, 77, 86, 16, 25, 65, 17, 78, - 79, 36, 58, 73, 18, 19, 21, 22, 20, 23, - 24, 108, 109, 110, 111, 112, 75, 64, 90, 107, - 26, 27, 28, 29, 30, 66, 80, 81, 96, 52, - 62, 53, 91, 46, 47, 48, 49, 100, 104, 116, - 124, 135, 101, 59, 31, 32, 33, 88, 117, 118, - 119, 34, 35, 37, 38, 40, 41, 39, 122, 42, - 43, 44, 50, 69, 105, 83, 123, 76, 131, 84, - 85, 102, 103, 89, 45, 67, 70, 51, 54, 92, - 93, 68, 132, 94, 55, 56, 57, 106, 145, 146, - 95, 63, 97, 98, 99, 133, 60, 61, 82, 71, - 72, 87, 113, 114, 115, 120, 121, 136, 137, 139, - 141, 142, 140, 143, 125, 127, 126, 128, 129, 130, - 134, 144, 138, 147, 0, 0, 0, 0, 0, 0, - 149, 151, 152, 153, 155, 156, 154, 0, 0, 0, - 0, 0, 158, 160, 161, 162, 163, 164, 0, 0, - 0, 0, 166, 168, 169, 170, 171, 0, 0, 0, - 0, 0, 0, 0, 0, 320, 322, 324, 323, 329, - 325, 326, 327, 328, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 339, 341, 342, 343, - 344, 345, 346, 347, 348, 349, 350, 351, 352, 0, - 366, 368, 173, 172, 177, 180, 178, 186, 187, 190, - 188, 189, 191, 192, 202, 203, 204, 205, 206, 226, - 227, 228, 233, 234, 183, 235, 236, 239, 237, 238, - 241, 242, 243, 256, 215, 216, 217, 218, 244, 259, - 211, 213, 260, 266, 267, 268, 184, 225, 278, 279, - 212, 273, 199, 179, 207, 257, 263, 245, 0, 0, - 282, 185, 174, 198, 249, 175, 181, 182, 208, 209, - 280, 247, 251, 252, 176, 283, 229, 255, 200, 214, - 261, 262, 265, 272, 210, 276, 274, 275, 219, 224, - 253, 254, 220, 221, 246, 269, 201, 193, 194, 195, - 196, 197, 284, 285, 286, 230, 231, 232, 240, 287, - 288, 248, 222, 370, 296, 298, 297, 0, 0, 301, - 250, 264, 277, 302, 303, 223, 289, 0, 0, 0, - 0, 0, 0, 270, 271, 371, 304, 305, 306, 309, - 308, 307, 310, 311, 312, 313, 314, 315, 0, 317, - 318, 330, 332, 331, 334, 335, 336, 337, 333, 353, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 14, 15, 74, 77, + 86, 16, 25, 65, 17, 78, 79, 36, 58, 73, + 18, 19, 21, 22, 20, 23, 24, 109, 110, 111, + 112, 113, 153, 75, 64, 90, 107, 108, 26, 27, + 28, 29, 30, 66, 80, 81, 96, 52, 62, 53, + 91, 46, 47, 48, 49, 100, 104, 117, 125, 140, + 101, 59, 31, 32, 33, 88, 118, 119, 120, 34, + 35, 37, 38, 40, 41, 39, 123, 42, 43, 44, + 50, 69, 105, 83, 124, 76, 136, 84, 85, 102, + 103, 89, 45, 67, 70, 51, 54, 92, 93, 68, + 137, 94, 55, 56, 57, 106, 150, 151, 95, 63, + 97, 98, 99, 138, 60, 61, 82, 71, 72, 87, + 114, 115, 116, 121, 122, 141, 142, 144, 146, 147, + 145, 148, 126, 127, 130, 131, 128, 129, 132, 133, + 135, 134, 139, 149, 143, 152, 0, 0, 0, 0, + 0, 0, 155, 157, 158, 159, 161, 162, 160, 0, + 0, 0, 0, 0, 164, 166, 167, 168, 169, 170, + 0, 0, 0, 0, 172, 174, 175, 176, 177, 0, + 0, 0, 0, 0, 0, 0, 0, 332, 334, 336, + 335, 341, 337, 338, 339, 340, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 351, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 369, 258, 281, 299, 300, 290, 291, 0, 0, - 0, 295, 316, 294, 292, 293 + 364, 0, 378, 380, 179, 178, 183, 186, 184, 192, + 193, 196, 194, 195, 197, 198, 210, 211, 212, 213, + 214, 234, 235, 236, 241, 242, 189, 243, 244, 247, + 245, 246, 249, 250, 251, 264, 223, 224, 225, 226, + 252, 267, 219, 221, 268, 274, 275, 276, 190, 233, + 286, 287, 220, 281, 206, 185, 215, 265, 271, 253, + 0, 0, 290, 191, 180, 205, 257, 181, 187, 188, + 216, 217, 288, 255, 259, 260, 182, 291, 237, 263, + 207, 222, 269, 270, 273, 280, 218, 284, 282, 283, + 227, 232, 261, 262, 228, 229, 254, 277, 208, 209, + 199, 200, 201, 202, 203, 292, 293, 294, 238, 239, + 240, 248, 295, 296, 256, 230, 382, 304, 308, 306, + 305, 309, 307, 0, 0, 312, 313, 258, 272, 285, + 314, 315, 231, 297, 0, 0, 0, 0, 0, 0, + 278, 279, 383, 204, 316, 317, 318, 321, 320, 319, + 322, 323, 324, 325, 326, 327, 0, 329, 330, 342, + 344, 343, 346, 347, 348, 349, 345, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 374, 375, 376, 381, + 266, 289, 310, 311, 298, 299, 0, 0, 0, 303, + 328, 302, 300, 301 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130 + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 10, 11, 18, 159, 12, 19, 300, 13, - 20, 312, 14, 21, 322, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 301, 302, 303, - 304, 305, 306, 313, 314, 315, 316, 317, 323, 324, - 325, 326, 15, 22, 335, 336, 337, 338, 339, 340, - 341, 342, 343, 16, 23, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 368, 17, 24, - 370, 371, 292, 293 + -1, 1, 10, 11, 18, 165, 12, 19, 312, 13, + 20, 324, 14, 21, 334, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 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, 313, 314, 315, 316, 317, 318, 325, + 326, 327, 328, 329, 335, 336, 337, 338, 15, 22, + 347, 348, 349, 350, 351, 352, 353, 354, 355, 16, + 23, 368, 369, 370, 371, 372, 373, 374, 375, 376, + 377, 378, 379, 380, 17, 24, 382, 383, 304, 305 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1240,93 +1262,95 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 318, 294, 369, 295, 296, 307, 372, 373, 374, - 0, 3, 375, 376, 308, 309, 344, 345, 346, 347, - 348, 349, 350, 351, 352, 353, 354, 355, 327, 328, - 329, 330, 331, 332, 333, 334, 377, 319, 320, 378, - 379, 4, 380, 381, 382, 383, 384, 5, 385, 386, - 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, - 397, 398, 399, 400, 401, 297, 402, 403, 404, 405, - 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, - 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, - 426, 6, 427, 428, 298, 429, 299, 310, 430, 311, - 431, 432, 433, 434, 435, 436, 437, 7, 438, 439, - 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, - 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, - 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, - 470, 321, 471, 472, 8, 0, 473, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 474, 475, 476, 9, 53, - 54, 55, 477, 478, 479, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 480, 481, 482, 483, - 484, 485, 486, 487, 488, 97, 98, 99, 489, 100, - 101, 102, 490, 491, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 492, 493, 494, 495, - 125, 126, 127, 128, 129, 130, 131, 132, 133, 496, - 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, - 507, 508, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 509, 155, 510, 156, 157, 158, 511, - 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, - 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, - 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, - 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, - 552, 553, 554, 555 + 2, 306, 381, 307, 308, 319, 384, 385, 386, 387, + 0, 3, 388, 320, 321, 356, 357, 358, 359, 360, + 361, 362, 363, 364, 365, 366, 367, 389, 390, 330, + 339, 340, 341, 342, 343, 344, 345, 346, 391, 392, + 393, 4, 394, 395, 396, 397, 398, 5, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, + 411, 412, 413, 414, 309, 331, 332, 415, 416, 417, + 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, + 438, 6, 439, 440, 310, 441, 311, 322, 442, 323, + 443, 444, 445, 446, 447, 448, 449, 7, 450, 451, + 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, + 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, + 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, + 482, 483, 484, 485, 0, 8, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 333, 486, 487, 488, 53, 54, + 55, 489, 490, 9, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 491, 492, 493, 494, 495, + 496, 497, 498, 499, 97, 98, 99, 500, 100, 101, + 102, 501, 502, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 121, 122, 123, 124, 125, 503, 504, 505, 506, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 507, + 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, + 518, 519, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 159, 520, 160, 521, + 161, 162, 163, 164, 522, 523, 524, 525, 526, 527, + 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, + 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, + 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, + 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, + 568, 569, 570, 571, 572, 573 }; static const yytype_int16 yycheck[] = { - 0, 40, 40, 108, 42, 43, 40, 10, 10, 10, - -1, 11, 10, 10, 48, 49, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 154, 155, 156, 92, 93, - 94, 95, 96, 97, 98, 99, 10, 76, 77, 10, + 0, 40, 108, 42, 43, 40, 10, 10, 10, 10, + -1, 11, 10, 48, 49, 146, 147, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 10, 10, 40, + 92, 93, 94, 95, 96, 97, 98, 99, 10, 10, 10, 41, 10, 10, 10, 10, 10, 47, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 103, 10, 10, 10, 10, + 10, 10, 10, 10, 103, 76, 77, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 91, 10, 10, 132, 10, 134, 131, 10, 133, + 10, 91, 10, 10, 133, 10, 135, 132, 10, 134, 10, 10, 10, 10, 10, 10, 10, 107, 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, 180, 10, 10, 144, -1, 10, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 10, 10, 10, 178, 44, - 45, 46, 10, 10, 10, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 100, 101, 102, 10, 104, - 105, 106, 10, 10, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 10, 10, 10, 10, - 135, 136, 137, 138, 139, 140, 141, 142, 143, 10, + 10, 10, 10, 10, -1, 145, 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, 185, 10, 10, 10, 44, 45, + 46, 10, 10, 183, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 100, 101, 102, 10, 104, 105, + 106, 10, 10, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 10, 10, 10, 10, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 10, 179, 10, 181, 182, 183, 10, + 10, 10, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 10, 184, 10, + 186, 187, 188, 189, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10 + 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, 185, 0, 11, 41, 47, 91, 107, 144, 178, - 186, 187, 190, 193, 196, 346, 357, 372, 188, 191, - 194, 197, 347, 358, 373, 12, 13, 14, 15, 16, + 0, 191, 0, 11, 41, 47, 91, 107, 145, 183, + 192, 193, 196, 199, 202, 358, 369, 384, 194, 197, + 200, 203, 359, 370, 385, 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, @@ -1336,11 +1360,11 @@ static const yytype_uint16 yystos[] = 84, 85, 86, 87, 88, 89, 90, 100, 101, 102, 104, 105, 106, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 157, 158, 159, 160, 161, 162, + 126, 127, 128, 129, 130, 131, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 179, 181, 182, 183, 189, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 184, 186, 187, 188, 189, 195, 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, @@ -1353,15 +1377,16 @@ static const yytype_uint16 yystos[] = 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, 376, 377, 40, 42, 43, 103, 132, 134, - 192, 331, 332, 333, 334, 335, 336, 40, 48, 49, - 131, 133, 195, 337, 338, 339, 340, 341, 40, 76, - 77, 180, 198, 342, 343, 344, 345, 92, 93, 94, - 95, 96, 97, 98, 99, 348, 349, 350, 351, 352, - 353, 354, 355, 356, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 108, - 374, 375, 10, 10, 10, 10, 10, 10, 10, 10, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, + 339, 340, 341, 342, 388, 389, 40, 42, 43, 103, + 133, 135, 198, 343, 344, 345, 346, 347, 348, 40, + 48, 49, 132, 134, 201, 349, 350, 351, 352, 353, + 40, 76, 77, 185, 204, 354, 355, 356, 357, 92, + 93, 94, 95, 96, 97, 98, 99, 360, 361, 362, + 363, 364, 365, 366, 367, 368, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, + 383, 108, 386, 387, 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, @@ -1379,30 +1404,31 @@ static const yytype_uint16 yystos[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 184, 185, 185, 186, 186, 186, 186, 186, 186, - 186, 187, 188, 188, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 190, 191, - 191, 192, 192, 192, 192, 192, 192, 193, 194, 194, - 195, 195, 195, 195, 195, 196, 197, 197, 198, 198, - 198, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 0, 190, 191, 191, 192, 192, 192, 192, 192, 192, + 192, 193, 194, 194, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 196, 197, 197, 198, 198, 198, + 198, 198, 198, 199, 200, 200, 201, 201, 201, 201, + 201, 202, 203, 203, 204, 204, 204, 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, @@ -1417,12 +1443,13 @@ static const yytype_uint16 yyr1[] = 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, 347, 348, 348, 348, 348, 348, 348, 348, 348, - 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, - 358, 359, 359, 359, 359, 359, 359, 359, 359, 359, - 359, 359, 359, 360, 361, 362, 363, 364, 365, 366, - 367, 368, 369, 370, 371, 372, 373, 373, 374, 375, - 376, 377 + 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, + 357, 358, 359, 359, 360, 360, 360, 360, 360, 360, + 360, 360, 361, 362, 363, 364, 365, 366, 367, 368, + 369, 370, 370, 371, 371, 371, 371, 371, 371, 371, + 371, 371, 371, 371, 371, 372, 373, 374, 375, 376, + 377, 378, 379, 380, 381, 382, 383, 384, 385, 385, + 386, 387, 388, 389 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1442,10 +1469,10 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 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, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, + 1, 1, 2, 0, 1, 1, 1, 1, 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, @@ -1453,19 +1480,20 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 3, 4, 4, 4, 3, 2, 2, 2, 3, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 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 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, + 4, 4, 4, 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, 3, 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 }; @@ -2142,15 +2170,15 @@ yyreduce: switch (yyn) { case 11: -#line 146 "util/configparser.y" /* yacc.c:1646 */ +#line 150 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(server:)\n")); } -#line 2150 "util/configparser.c" /* yacc.c:1646 */ +#line 2178 "util/configparser.c" /* yacc.c:1646 */ break; - case 148: -#line 212 "util/configparser.y" /* yacc.c:1646 */ + case 154: +#line 219 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2161,11 +2189,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2165 "util/configparser.c" /* yacc.c:1646 */ +#line 2193 "util/configparser.c" /* yacc.c:1646 */ break; - case 157: -#line 229 "util/configparser.y" /* yacc.c:1646 */ + case 163: +#line 236 "util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2176,11 +2204,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2180 "util/configparser.c" /* yacc.c:1646 */ +#line 2208 "util/configparser.c" /* yacc.c:1646 */ break; - case 165: -#line 246 "util/configparser.y" /* yacc.c:1646 */ + case 171: +#line 253 "util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2193,11 +2221,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2197 "util/configparser.c" /* yacc.c:1646 */ +#line 2225 "util/configparser.c" /* yacc.c:1646 */ break; - case 172: -#line 264 "util/configparser.y" /* yacc.c:1646 */ + case 178: +#line 271 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2205,11 +2233,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2209 "util/configparser.c" /* yacc.c:1646 */ +#line 2237 "util/configparser.c" /* yacc.c:1646 */ break; - case 173: -#line 273 "util/configparser.y" /* yacc.c:1646 */ + case 179: +#line 280 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2217,11 +2245,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2221 "util/configparser.c" /* yacc.c:1646 */ +#line 2249 "util/configparser.c" /* yacc.c:1646 */ break; - case 174: -#line 282 "util/configparser.y" /* yacc.c:1646 */ + case 180: +#line 289 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2231,11 +2259,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2235 "util/configparser.c" /* yacc.c:1646 */ +#line 2263 "util/configparser.c" /* yacc.c:1646 */ break; - case 175: -#line 293 "util/configparser.y" /* yacc.c:1646 */ + case 181: +#line 300 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2243,11 +2271,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2247 "util/configparser.c" /* yacc.c:1646 */ +#line 2275 "util/configparser.c" /* yacc.c:1646 */ break; - case 176: -#line 302 "util/configparser.y" /* yacc.c:1646 */ + case 182: +#line 309 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2255,11 +2283,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2259 "util/configparser.c" /* yacc.c:1646 */ +#line 2287 "util/configparser.c" /* yacc.c:1646 */ break; - case 177: -#line 311 "util/configparser.y" /* yacc.c:1646 */ + case 183: +#line 318 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2267,11 +2295,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2271 "util/configparser.c" /* yacc.c:1646 */ +#line 2299 "util/configparser.c" /* yacc.c:1646 */ break; - case 178: -#line 320 "util/configparser.y" /* yacc.c:1646 */ + case 184: +#line 327 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2283,11 +2311,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2287 "util/configparser.c" /* yacc.c:1646 */ +#line 2315 "util/configparser.c" /* yacc.c:1646 */ break; - case 179: -#line 333 "util/configparser.y" /* yacc.c:1646 */ + case 185: +#line 340 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2301,11 +2329,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2305 "util/configparser.c" /* yacc.c:1646 */ +#line 2333 "util/configparser.c" /* yacc.c:1646 */ break; - case 180: -#line 348 "util/configparser.y" /* yacc.c:1646 */ + case 186: +#line 355 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2313,11 +2341,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2317 "util/configparser.c" /* yacc.c:1646 */ +#line 2345 "util/configparser.c" /* yacc.c:1646 */ break; - case 181: -#line 357 "util/configparser.y" /* yacc.c:1646 */ + case 187: +#line 364 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2325,11 +2353,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2329 "util/configparser.c" /* yacc.c:1646 */ +#line 2357 "util/configparser.c" /* yacc.c:1646 */ break; - case 182: -#line 366 "util/configparser.y" /* yacc.c:1646 */ + case 188: +#line 373 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2337,11 +2365,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2341 "util/configparser.c" /* yacc.c:1646 */ +#line 2369 "util/configparser.c" /* yacc.c:1646 */ break; - case 183: -#line 375 "util/configparser.y" /* yacc.c:1646 */ + case 189: +#line 382 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2349,11 +2377,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2353 "util/configparser.c" /* yacc.c:1646 */ +#line 2381 "util/configparser.c" /* yacc.c:1646 */ break; - case 184: -#line 384 "util/configparser.y" /* yacc.c:1646 */ + case 190: +#line 391 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2361,11 +2389,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2365 "util/configparser.c" /* yacc.c:1646 */ +#line 2393 "util/configparser.c" /* yacc.c:1646 */ break; - case 185: -#line 393 "util/configparser.y" /* yacc.c:1646 */ + case 191: +#line 400 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2373,11 +2401,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2377 "util/configparser.c" /* yacc.c:1646 */ +#line 2405 "util/configparser.c" /* yacc.c:1646 */ break; - case 186: -#line 402 "util/configparser.y" /* yacc.c:1646 */ + case 192: +#line 409 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2385,11 +2413,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2389 "util/configparser.c" /* yacc.c:1646 */ +#line 2417 "util/configparser.c" /* yacc.c:1646 */ break; - case 187: -#line 411 "util/configparser.y" /* yacc.c:1646 */ + case 193: +#line 418 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2397,11 +2425,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2401 "util/configparser.c" /* yacc.c:1646 */ +#line 2429 "util/configparser.c" /* yacc.c:1646 */ break; - case 188: -#line 420 "util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 427 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2409,11 +2437,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2413 "util/configparser.c" /* yacc.c:1646 */ +#line 2441 "util/configparser.c" /* yacc.c:1646 */ break; - case 189: -#line 429 "util/configparser.y" /* yacc.c:1646 */ + case 195: +#line 436 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2421,11 +2449,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2425 "util/configparser.c" /* yacc.c:1646 */ +#line 2453 "util/configparser.c" /* yacc.c:1646 */ break; - case 190: -#line 438 "util/configparser.y" /* yacc.c:1646 */ + case 196: +#line 445 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2433,11 +2461,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2437 "util/configparser.c" /* yacc.c:1646 */ +#line 2465 "util/configparser.c" /* yacc.c:1646 */ break; - case 191: -#line 447 "util/configparser.y" /* yacc.c:1646 */ + case 197: +#line 454 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2445,11 +2473,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2449 "util/configparser.c" /* yacc.c:1646 */ +#line 2477 "util/configparser.c" /* yacc.c:1646 */ break; - case 192: -#line 456 "util/configparser.y" /* yacc.c:1646 */ + case 198: +#line 463 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2457,11 +2485,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2461 "util/configparser.c" /* yacc.c:1646 */ +#line 2489 "util/configparser.c" /* yacc.c:1646 */ break; - case 193: -#line 465 "util/configparser.y" /* yacc.c:1646 */ + case 199: +#line 472 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2469,11 +2497,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2473 "util/configparser.c" /* yacc.c:1646 */ +#line 2501 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: -#line 474 "util/configparser.y" /* yacc.c:1646 */ + case 200: +#line 481 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2481,31 +2509,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2485 "util/configparser.c" /* yacc.c:1646 */ +#line 2513 "util/configparser.c" /* yacc.c:1646 */ break; - case 195: -#line 483 "util/configparser.y" /* yacc.c:1646 */ + case 201: +#line 490 "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 2495 "util/configparser.c" /* yacc.c:1646 */ +#line 2523 "util/configparser.c" /* yacc.c:1646 */ break; - case 196: -#line 490 "util/configparser.y" /* yacc.c:1646 */ + case 202: +#line 497 "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 2505 "util/configparser.c" /* yacc.c:1646 */ +#line 2533 "util/configparser.c" /* yacc.c:1646 */ break; - case 197: -#line 497 "util/configparser.y" /* yacc.c:1646 */ + case 203: +#line 504 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2513,11 +2541,23 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2517 "util/configparser.c" /* yacc.c:1646 */ +#line 2545 "util/configparser.c" /* yacc.c:1646 */ break; - case 198: -#line 506 "util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 513 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2557 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 205: +#line 522 "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) @@ -2525,11 +2565,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2529 "util/configparser.c" /* yacc.c:1646 */ +#line 2569 "util/configparser.c" /* yacc.c:1646 */ break; - case 199: -#line 515 "util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 531 "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) @@ -2542,11 +2582,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2546 "util/configparser.c" /* yacc.c:1646 */ +#line 2586 "util/configparser.c" /* yacc.c:1646 */ break; - case 200: -#line 529 "util/configparser.y" /* yacc.c:1646 */ + case 207: +#line 545 "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) @@ -2554,11 +2594,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2558 "util/configparser.c" /* yacc.c:1646 */ +#line 2598 "util/configparser.c" /* yacc.c:1646 */ break; - case 201: -#line 538 "util/configparser.y" /* yacc.c:1646 */ + case 208: +#line 554 "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) @@ -2566,31 +2606,43 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2570 "util/configparser.c" /* yacc.c:1646 */ +#line 2610 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 547 "util/configparser.y" /* yacc.c:1646 */ + case 209: +#line 563 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2622 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 210: +#line 572 "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 2580 "util/configparser.c" /* yacc.c:1646 */ +#line 2632 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: -#line 554 "util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 579 "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 2590 "util/configparser.c" /* yacc.c:1646 */ +#line 2642 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 561 "util/configparser.y" /* yacc.c:1646 */ + case 212: +#line 586 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -2608,120 +2660,122 @@ yyreduce: strncmp(d, cfg_parser->chroot, strlen( cfg_parser->chroot)) == 0) d += strlen(cfg_parser->chroot); - if(chdir(d)) + if(d[0]) { + if(chdir(d)) log_err("cannot chdir to directory: %s (%s)", d, strerror(errno)); + } } } -#line 2617 "util/configparser.c" /* yacc.c:1646 */ +#line 2671 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 585 "util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 612 "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 2628 "util/configparser.c" /* yacc.c:1646 */ +#line 2682 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 593 "util/configparser.y" /* yacc.c:1646 */ + case 214: +#line 620 "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 2638 "util/configparser.c" /* yacc.c:1646 */ +#line 2692 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 600 "util/configparser.y" /* yacc.c:1646 */ + case 215: +#line 627 "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 2648 "util/configparser.c" /* yacc.c:1646 */ +#line 2702 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 607 "util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 634 "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 2658 "util/configparser.c" /* yacc.c:1646 */ +#line 2712 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 614 "util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 641 "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 2668 "util/configparser.c" /* yacc.c:1646 */ +#line 2722 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 621 "util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 648 "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 2679 "util/configparser.c" /* yacc.c:1646 */ +#line 2733 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 629 "util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 656 "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 2690 "util/configparser.c" /* yacc.c:1646 */ +#line 2744 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 637 "util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 664 "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 2701 "util/configparser.c" /* yacc.c:1646 */ +#line 2755 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 645 "util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 672 "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 2711 "util/configparser.c" /* yacc.c:1646 */ +#line 2765 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 652 "util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 679 "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 2721 "util/configparser.c" /* yacc.c:1646 */ +#line 2775 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 659 "util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 686 "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) @@ -2729,11 +2783,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2733 "util/configparser.c" /* yacc.c:1646 */ +#line 2787 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 668 "util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 695 "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) @@ -2741,53 +2795,53 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2745 "util/configparser.c" /* yacc.c:1646 */ +#line 2799 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 677 "util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 704 "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 2755 "util/configparser.c" /* yacc.c:1646 */ +#line 2809 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 684 "util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 711 "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 2765 "util/configparser.c" /* yacc.c:1646 */ +#line 2819 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 691 "util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 718 "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 2776 "util/configparser.c" /* yacc.c:1646 */ +#line 2830 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 699 "util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 726 "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 2787 "util/configparser.c" /* yacc.c:1646 */ +#line 2841 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 707 "util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 734 "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) @@ -2796,11 +2850,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2800 "util/configparser.c" /* yacc.c:1646 */ +#line 2854 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 717 "util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 744 "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) @@ -2809,11 +2863,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2813 "util/configparser.c" /* yacc.c:1646 */ +#line 2867 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 727 "util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 754 "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) @@ -2822,11 +2876,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2826 "util/configparser.c" /* yacc.c:1646 */ +#line 2880 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 737 "util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 764 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2838,11 +2892,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2842 "util/configparser.c" /* yacc.c:1646 */ +#line 2896 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 750 "util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 777 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2852,22 +2906,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2856 "util/configparser.c" /* yacc.c:1646 */ +#line 2910 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 761 "util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 788 "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 2867 "util/configparser.c" /* yacc.c:1646 */ +#line 2921 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 769 "util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 796 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2879,11 +2933,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 2883 "util/configparser.c" /* yacc.c:1646 */ +#line 2937 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 782 "util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 809 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2891,11 +2945,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2895 "util/configparser.c" /* yacc.c:1646 */ +#line 2949 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 791 "util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 818 "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) @@ -2903,11 +2957,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2907 "util/configparser.c" /* yacc.c:1646 */ +#line 2961 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 800 "util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 827 "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) @@ -2915,11 +2969,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2919 "util/configparser.c" /* yacc.c:1646 */ +#line 2973 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 809 "util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 836 "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) @@ -2928,11 +2982,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2932 "util/configparser.c" /* yacc.c:1646 */ +#line 2986 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 819 "util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 846 "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) @@ -2941,22 +2995,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2945 "util/configparser.c" /* yacc.c:1646 */ +#line 2999 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 829 "util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 856 "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 2956 "util/configparser.c" /* yacc.c:1646 */ +#line 3010 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 837 "util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 864 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2968,11 +3022,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 2972 "util/configparser.c" /* yacc.c:1646 */ +#line 3026 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 850 "util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 877 "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) @@ -2980,22 +3034,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2984 "util/configparser.c" /* yacc.c:1646 */ +#line 3038 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 859 "util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 886 "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 2995 "util/configparser.c" /* yacc.c:1646 */ +#line 3049 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 867 "util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 894 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3003,22 +3057,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3007 "util/configparser.c" /* yacc.c:1646 */ +#line 3061 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 876 "util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 903 "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 3018 "util/configparser.c" /* yacc.c:1646 */ +#line 3072 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 884 "util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 911 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3030,11 +3084,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3034 "util/configparser.c" /* yacc.c:1646 */ +#line 3088 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 897 "util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 924 "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) @@ -3042,21 +3096,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3046 "util/configparser.c" /* yacc.c:1646 */ +#line 3100 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 906 "util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 933 "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 3056 "util/configparser.c" /* yacc.c:1646 */ +#line 3110 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 913 "util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 940 "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) @@ -3065,11 +3119,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3069 "util/configparser.c" /* yacc.c:1646 */ +#line 3123 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 923 "util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 950 "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) @@ -3078,11 +3132,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3082 "util/configparser.c" /* yacc.c:1646 */ +#line 3136 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 933 "util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 960 "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) @@ -3091,11 +3145,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3095 "util/configparser.c" /* yacc.c:1646 */ +#line 3149 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 943 "util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 970 "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) @@ -3104,11 +3158,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3108 "util/configparser.c" /* yacc.c:1646 */ +#line 3162 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 953 "util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 980 "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) @@ -3117,11 +3171,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3121 "util/configparser.c" /* yacc.c:1646 */ +#line 3175 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 963 "util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 990 "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) @@ -3130,11 +3184,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3134 "util/configparser.c" /* yacc.c:1646 */ +#line 3188 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 973 "util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 1000 "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) @@ -3143,11 +3197,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3147 "util/configparser.c" /* yacc.c:1646 */ +#line 3201 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 983 "util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 1010 "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) @@ -3156,41 +3210,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3160 "util/configparser.c" /* yacc.c:1646 */ +#line 3214 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 993 "util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 1020 "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 3170 "util/configparser.c" /* yacc.c:1646 */ +#line 3224 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 1000 "util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 1027 "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 3180 "util/configparser.c" /* yacc.c:1646 */ +#line 3234 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 1007 "util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 1034 "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 3190 "util/configparser.c" /* yacc.c:1646 */ +#line 3244 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 1014 "util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 1041 "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) @@ -3198,11 +3252,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3202 "util/configparser.c" /* yacc.c:1646 */ +#line 3256 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 1023 "util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 1050 "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) @@ -3210,11 +3264,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3214 "util/configparser.c" /* yacc.c:1646 */ +#line 3268 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 1032 "util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 1059 "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) @@ -3222,21 +3276,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3226 "util/configparser.c" /* yacc.c:1646 */ +#line 3280 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 1041 "util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 1068 "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 3236 "util/configparser.c" /* yacc.c:1646 */ +#line 3290 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 1048 "util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 1075 "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) @@ -3245,11 +3299,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3249 "util/configparser.c" /* yacc.c:1646 */ +#line 3303 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 1058 "util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 1085 "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 && @@ -3265,21 +3319,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3269 "util/configparser.c" /* yacc.c:1646 */ +#line 3323 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 1075 "util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 1102 "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 3279 "util/configparser.c" /* yacc.c:1646 */ +#line 3333 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 1082 "util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 1109 "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) { @@ -3296,11 +3350,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3300 "util/configparser.c" /* yacc.c:1646 */ +#line 3354 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 1100 "util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 1127 "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) { @@ -3312,11 +3366,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3316 "util/configparser.c" /* yacc.c:1646 */ +#line 3370 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 1113 "util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 1140 "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) { @@ -3328,11 +3382,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3332 "util/configparser.c" /* yacc.c:1646 */ +#line 3386 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 1126 "util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 1153 "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) @@ -3340,11 +3394,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3344 "util/configparser.c" /* yacc.c:1646 */ +#line 3398 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 1135 "util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 1162 "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) @@ -3352,11 +3406,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3356 "util/configparser.c" /* yacc.c:1646 */ +#line 3410 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 1144 "util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 1171 "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) @@ -3364,11 +3418,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3368 "util/configparser.c" /* yacc.c:1646 */ +#line 3422 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 1153 "util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 1180 "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) @@ -3376,11 +3430,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3380 "util/configparser.c" /* yacc.c:1646 */ +#line 3434 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 1162 "util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 1189 "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) @@ -3389,11 +3443,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3393 "util/configparser.c" /* yacc.c:1646 */ +#line 3447 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 1172 "util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 1199 "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) @@ -3402,11 +3456,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3406 "util/configparser.c" /* yacc.c:1646 */ +#line 3460 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 1182 "util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1209 "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) @@ -3414,11 +3468,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3418 "util/configparser.c" /* yacc.c:1646 */ +#line 3472 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 1191 "util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1218 "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) @@ -3426,25 +3480,27 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3430 "util/configparser.c" /* yacc.c:1646 */ +#line 3484 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 1200 "util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1227 "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) yyerror("expected yes or no."); +#ifdef HAVE_SSL else fake_dsa = (strcmp((yyvsp[0].str), "yes")==0); if(fake_dsa) log_warn("test option fake_dsa is enabled"); +#endif free((yyvsp[0].str)); } -#line 3444 "util/configparser.c" /* yacc.c:1646 */ +#line 3500 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 1211 "util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1240 "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) @@ -3452,21 +3508,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3456 "util/configparser.c" /* yacc.c:1646 */ +#line 3512 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 1220 "util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1249 "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 3466 "util/configparser.c" /* yacc.c:1646 */ +#line 3522 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 1227 "util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1256 "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) @@ -3474,11 +3530,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3478 "util/configparser.c" /* yacc.c:1646 */ +#line 3534 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 1236 "util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1265 "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) @@ -3486,11 +3542,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3490 "util/configparser.c" /* yacc.c:1646 */ +#line 3546 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1245 "util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1274 "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) @@ -3498,11 +3554,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3502 "util/configparser.c" /* yacc.c:1646 */ +#line 3558 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1254 "util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1283 "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) @@ -3511,22 +3567,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3515 "util/configparser.c" /* yacc.c:1646 */ +#line 3571 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1263 "util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1292 "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 3526 "util/configparser.c" /* yacc.c:1646 */ +#line 3582 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1271 "util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1300 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3538,22 +3594,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3542 "util/configparser.c" /* yacc.c:1646 */ +#line 3598 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1284 "util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1313 "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 3553 "util/configparser.c" /* yacc.c:1646 */ +#line 3609 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1292 "util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1321 "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 && @@ -3580,21 +3636,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3584 "util/configparser.c" /* yacc.c:1646 */ +#line 3640 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1320 "util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1349 "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 3594 "util/configparser.c" /* yacc.c:1646 */ +#line 3650 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1327 "util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1356 "util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -3608,11 +3664,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 3612 "util/configparser.c" /* yacc.c:1646 */ +#line 3668 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1342 "util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1371 "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) @@ -3621,11 +3677,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3625 "util/configparser.c" /* yacc.c:1646 */ +#line 3681 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1352 "util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1381 "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) @@ -3634,31 +3690,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3638 "util/configparser.c" /* yacc.c:1646 */ +#line 3694 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1362 "util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1391 "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 3648 "util/configparser.c" /* yacc.c:1646 */ +#line 3704 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1369 "util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1398 "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 3658 "util/configparser.c" /* yacc.c:1646 */ +#line 3714 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1376 "util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1405 "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) @@ -3666,11 +3722,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3670 "util/configparser.c" /* yacc.c:1646 */ +#line 3726 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1385 "util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1414 "util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -3683,11 +3739,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3687 "util/configparser.c" /* yacc.c:1646 */ +#line 3743 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1399 "util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1428 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3705,11 +3761,11 @@ yyreduce: } } } -#line 3709 "util/configparser.c" /* yacc.c:1646 */ +#line 3765 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1418 "util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1447 "util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3727,11 +3783,11 @@ yyreduce: } } } -#line 3731 "util/configparser.c" /* yacc.c:1646 */ +#line 3787 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1437 "util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1466 "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, @@ -3742,11 +3798,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3746 "util/configparser.c" /* yacc.c:1646 */ +#line 3802 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1449 "util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1478 "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, @@ -3757,11 +3813,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3761 "util/configparser.c" /* yacc.c:1646 */ +#line 3817 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1461 "util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1490 "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, @@ -3772,11 +3828,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3776 "util/configparser.c" /* yacc.c:1646 */ +#line 3832 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1473 "util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1502 "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, @@ -3786,11 +3842,23 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3790 "util/configparser.c" /* yacc.c:1646 */ +#line 3846 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1484 "util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1513 "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) + yyerror("number expected"); + else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 3858 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 305: +#line 1523 "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) @@ -3798,22 +3866,49 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3802 "util/configparser.c" /* yacc.c:1646 */ +#line 3870 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1493 "util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1532 "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 3881 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 307: +#line 1540 "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 3813 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1501 "util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1548 "util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); + if(atoi((yyvsp[0].str)) == 0) + yyerror("number expected"); + else { + cfg_parser->cfg->ip_ratelimit_slabs = atoi((yyvsp[0].str)); + if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs)) + yyerror("must be a power of 2"); + } + free((yyvsp[0].str)); + } +#line 3908 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 309: +#line 1561 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3825,11 +3920,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3829 "util/configparser.c" /* yacc.c:1646 */ +#line 3924 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1514 "util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1574 "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) { @@ -3841,11 +3936,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 3845 "util/configparser.c" /* yacc.c:1646 */ +#line 3940 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1527 "util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1587 "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) { @@ -3857,11 +3952,23 @@ yyreduce: "ratelimit-below-domain"); } } -#line 3861 "util/configparser.c" /* yacc.c:1646 */ +#line 3956 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1540 "util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1600 "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) + yyerror("number expected"); + else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 3968 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 313: +#line 1609 "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) @@ -3869,11 +3976,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3873 "util/configparser.c" /* yacc.c:1646 */ +#line 3980 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1549 "util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1618 "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) @@ -3882,11 +3989,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3886 "util/configparser.c" /* yacc.c:1646 */ +#line 3993 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1559 "util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1628 "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) @@ -3895,11 +4002,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3899 "util/configparser.c" /* yacc.c:1646 */ +#line 4006 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1569 "util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1638 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -3908,31 +4015,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 3912 "util/configparser.c" /* yacc.c:1646 */ +#line 4019 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1579 "util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1648 "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 3922 "util/configparser.c" /* yacc.c:1646 */ +#line 4029 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1586 "util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1655 "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 3932 "util/configparser.c" /* yacc.c:1646 */ +#line 4039 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1593 "util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1662 "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) @@ -3940,11 +4047,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3944 "util/configparser.c" /* yacc.c:1646 */ +#line 4051 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1602 "util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1671 "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) @@ -3953,11 +4060,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3957 "util/configparser.c" /* yacc.c:1646 */ +#line 4064 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1612 "util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1681 "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) @@ -3966,11 +4073,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3970 "util/configparser.c" /* yacc.c:1646 */ +#line 4077 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1622 "util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1691 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -3979,31 +4086,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 3983 "util/configparser.c" /* yacc.c:1646 */ +#line 4090 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1632 "util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1701 "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 3993 "util/configparser.c" /* yacc.c:1646 */ +#line 4100 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1639 "util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1708 "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 4003 "util/configparser.c" /* yacc.c:1646 */ +#line 4110 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1646 "util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1715 "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) @@ -4011,11 +4118,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4015 "util/configparser.c" /* yacc.c:1646 */ +#line 4122 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1655 "util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1724 "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) @@ -4024,11 +4131,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4028 "util/configparser.c" /* yacc.c:1646 */ +#line 4135 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1665 "util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1734 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4037,11 +4144,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4041 "util/configparser.c" /* yacc.c:1646 */ +#line 4148 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1675 "util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1744 "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 && @@ -4069,11 +4176,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4073 "util/configparser.c" /* yacc.c:1646 */ +#line 4180 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1704 "util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1773 "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))) { @@ -4081,11 +4188,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4085 "util/configparser.c" /* yacc.c:1646 */ +#line 4192 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1713 "util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1782 "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) @@ -4093,19 +4200,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4097 "util/configparser.c" /* yacc.c:1646 */ +#line 4204 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1722 "util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1791 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4105 "util/configparser.c" /* yacc.c:1646 */ +#line 4212 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1733 "util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1802 "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) @@ -4114,11 +4221,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4118 "util/configparser.c" /* yacc.c:1646 */ +#line 4225 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1743 "util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1812 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4126,21 +4233,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4130 "util/configparser.c" /* yacc.c:1646 */ +#line 4237 "util/configparser.c" /* yacc.c:1646 */ break; - case 332: -#line 1752 "util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1821 "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 4140 "util/configparser.c" /* yacc.c:1646 */ +#line 4247 "util/configparser.c" /* yacc.c:1646 */ break; - case 333: -#line 1759 "util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1828 "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) @@ -4149,122 +4256,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4153 "util/configparser.c" /* yacc.c:1646 */ +#line 4260 "util/configparser.c" /* yacc.c:1646 */ break; - case 334: -#line 1769 "util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1838 "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 4163 "util/configparser.c" /* yacc.c:1646 */ +#line 4270 "util/configparser.c" /* yacc.c:1646 */ break; - case 335: -#line 1776 "util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1845 "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 4173 "util/configparser.c" /* yacc.c:1646 */ +#line 4280 "util/configparser.c" /* yacc.c:1646 */ break; - case 336: -#line 1783 "util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1852 "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 4183 "util/configparser.c" /* yacc.c:1646 */ +#line 4290 "util/configparser.c" /* yacc.c:1646 */ break; - case 337: -#line 1790 "util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1859 "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 4193 "util/configparser.c" /* yacc.c:1646 */ +#line 4300 "util/configparser.c" /* yacc.c:1646 */ break; - case 338: -#line 1797 "util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1866 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4201 "util/configparser.c" /* yacc.c:1646 */ +#line 4308 "util/configparser.c" /* yacc.c:1646 */ break; - case 353: -#line 1814 "util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1883 "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 4212 "util/configparser.c" /* yacc.c:1646 */ +#line 4319 "util/configparser.c" /* yacc.c:1646 */ break; - case 354: -#line 1822 "util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1891 "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 4222 "util/configparser.c" /* yacc.c:1646 */ +#line 4329 "util/configparser.c" /* yacc.c:1646 */ break; - case 355: -#line 1829 "util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1898 "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 4233 "util/configparser.c" /* yacc.c:1646 */ +#line 4340 "util/configparser.c" /* yacc.c:1646 */ break; - case 356: -#line 1837 "util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1906 "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 4244 "util/configparser.c" /* yacc.c:1646 */ +#line 4351 "util/configparser.c" /* yacc.c:1646 */ break; - case 357: -#line 1845 "util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1914 "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 4254 "util/configparser.c" /* yacc.c:1646 */ +#line 4361 "util/configparser.c" /* yacc.c:1646 */ break; - case 358: -#line 1852 "util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1921 "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 4264 "util/configparser.c" /* yacc.c:1646 */ +#line 4371 "util/configparser.c" /* yacc.c:1646 */ break; - case 359: -#line 1859 "util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1928 "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) @@ -4272,11 +4379,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4276 "util/configparser.c" /* yacc.c:1646 */ +#line 4383 "util/configparser.c" /* yacc.c:1646 */ break; - case 360: -#line 1868 "util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1937 "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) @@ -4284,11 +4391,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4288 "util/configparser.c" /* yacc.c:1646 */ +#line 4395 "util/configparser.c" /* yacc.c:1646 */ break; - case 361: -#line 1877 "util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1946 "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) @@ -4296,11 +4403,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4300 "util/configparser.c" /* yacc.c:1646 */ +#line 4407 "util/configparser.c" /* yacc.c:1646 */ break; - case 362: -#line 1886 "util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1955 "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) @@ -4308,11 +4415,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4312 "util/configparser.c" /* yacc.c:1646 */ +#line 4419 "util/configparser.c" /* yacc.c:1646 */ break; - case 363: -#line 1895 "util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1964 "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) @@ -4320,11 +4427,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4324 "util/configparser.c" /* yacc.c:1646 */ +#line 4431 "util/configparser.c" /* yacc.c:1646 */ break; - case 364: -#line 1904 "util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1973 "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) @@ -4332,29 +4439,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4336 "util/configparser.c" /* yacc.c:1646 */ +#line 4443 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1913 "util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1982 "util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(python:)\n")); } -#line 4344 "util/configparser.c" /* yacc.c:1646 */ +#line 4451 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1922 "util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1991 "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 4354 "util/configparser.c" /* yacc.c:1646 */ +#line 4461 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1928 "util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1997 "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) @@ -4363,21 +4470,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4367 "util/configparser.c" /* yacc.c:1646 */ +#line 4474 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1938 "util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 2007 "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 4377 "util/configparser.c" /* yacc.c:1646 */ +#line 4484 "util/configparser.c" /* yacc.c:1646 */ break; -#line 4381 "util/configparser.c" /* yacc.c:1646 */ +#line 4488 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4605,7 +4712,7 @@ yyreturn: #endif return yyresult; } -#line 1944 "util/configparser.y" /* yacc.c:1906 */ +#line 2013 "util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ |