diff options
Diffstat (limited to 'util/configparser.c')
| -rw-r--r-- | util/configparser.c | 1049 |
1 files changed, 543 insertions, 506 deletions
diff --git a/util/configparser.c b/util/configparser.c index f5d04f216efe..3ea82b20a54c 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -242,19 +242,21 @@ extern int yydebug; VAR_PREFETCH = 370, VAR_PREFETCH_KEY = 371, VAR_SO_SNDBUF = 372, - VAR_HARDEN_BELOW_NXDOMAIN = 373, - VAR_IGNORE_CD_FLAG = 374, - VAR_LOG_QUERIES = 375, - VAR_TCP_UPSTREAM = 376, - VAR_SSL_UPSTREAM = 377, - VAR_SSL_SERVICE_KEY = 378, - VAR_SSL_SERVICE_PEM = 379, - VAR_SSL_PORT = 380, - VAR_FORWARD_FIRST = 381, - VAR_STUB_FIRST = 382, - VAR_MINIMAL_RESPONSES = 383, - VAR_RRSET_ROUNDROBIN = 384, - VAR_MAX_UDP_SIZE = 385 + VAR_SO_REUSEPORT = 373, + VAR_HARDEN_BELOW_NXDOMAIN = 374, + VAR_IGNORE_CD_FLAG = 375, + VAR_LOG_QUERIES = 376, + VAR_TCP_UPSTREAM = 377, + VAR_SSL_UPSTREAM = 378, + VAR_SSL_SERVICE_KEY = 379, + VAR_SSL_SERVICE_PEM = 380, + VAR_SSL_PORT = 381, + VAR_FORWARD_FIRST = 382, + VAR_STUB_FIRST = 383, + VAR_MINIMAL_RESPONSES = 384, + VAR_RRSET_ROUNDROBIN = 385, + VAR_MAX_UDP_SIZE = 386, + VAR_DELAY_CLOSE = 387 }; #endif /* Tokens. */ @@ -373,19 +375,21 @@ extern int yydebug; #define VAR_PREFETCH 370 #define VAR_PREFETCH_KEY 371 #define VAR_SO_SNDBUF 372 -#define VAR_HARDEN_BELOW_NXDOMAIN 373 -#define VAR_IGNORE_CD_FLAG 374 -#define VAR_LOG_QUERIES 375 -#define VAR_TCP_UPSTREAM 376 -#define VAR_SSL_UPSTREAM 377 -#define VAR_SSL_SERVICE_KEY 378 -#define VAR_SSL_SERVICE_PEM 379 -#define VAR_SSL_PORT 380 -#define VAR_FORWARD_FIRST 381 -#define VAR_STUB_FIRST 382 -#define VAR_MINIMAL_RESPONSES 383 -#define VAR_RRSET_ROUNDROBIN 384 -#define VAR_MAX_UDP_SIZE 385 +#define VAR_SO_REUSEPORT 373 +#define VAR_HARDEN_BELOW_NXDOMAIN 374 +#define VAR_IGNORE_CD_FLAG 375 +#define VAR_LOG_QUERIES 376 +#define VAR_TCP_UPSTREAM 377 +#define VAR_SSL_UPSTREAM 378 +#define VAR_SSL_SERVICE_KEY 379 +#define VAR_SSL_SERVICE_PEM 380 +#define VAR_SSL_PORT 381 +#define VAR_FORWARD_FIRST 382 +#define VAR_STUB_FIRST 383 +#define VAR_MINIMAL_RESPONSES 384 +#define VAR_RRSET_ROUNDROBIN 385 +#define VAR_MAX_UDP_SIZE 386 +#define VAR_DELAY_CLOSE 387 @@ -399,7 +403,7 @@ typedef union YYSTYPE /* Line 350 of yacc.c */ -#line 403 "util/configparser.c" +#line 407 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -427,7 +431,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 353 of yacc.c */ -#line 431 "util/configparser.c" +#line 435 "util/configparser.c" #ifdef short # undef short @@ -647,20 +651,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 239 +#define YYLAST 244 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 131 +#define YYNTOKENS 133 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 134 +#define YYNNTS 136 /* YYNRULES -- Number of rules. */ -#define YYNRULES 255 +#define YYNRULES 259 /* YYNRULES -- Number of states. */ -#define YYNSTATES 374 +#define YYNSTATES 380 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 385 +#define YYMAXUTOK 387 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -706,7 +710,7 @@ static const yytype_uint8 yytranslate[] = 95, 96, 97, 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 + 125, 126, 127, 128, 129, 130, 131, 132 }; #if YYDEBUG @@ -725,89 +729,90 @@ static const yytype_uint16 yyprhs[] = 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, - 224, 226, 228, 231, 232, 234, 236, 238, 240, 242, - 244, 247, 248, 250, 252, 254, 256, 259, 262, 265, - 268, 271, 274, 277, 280, 283, 286, 289, 292, 295, - 298, 301, 304, 307, 310, 313, 316, 319, 322, 325, - 328, 331, 334, 337, 340, 343, 346, 349, 352, 355, - 358, 361, 364, 367, 370, 373, 376, 379, 382, 385, - 388, 391, 394, 397, 400, 403, 406, 409, 412, 415, - 418, 421, 424, 427, 430, 433, 436, 439, 442, 445, - 448, 451, 454, 457, 460, 463, 466, 469, 472, 475, - 478, 482, 485, 488, 491, 494, 497, 500, 503, 506, - 509, 512, 515, 518, 521, 524, 527, 530, 533, 536, - 540, 543, 546, 549, 552, 555, 558, 561, 564, 567, - 570, 573, 576, 579, 582, 584, 587, 588, 590, 592, - 594, 596, 598, 600, 602, 605, 608, 611, 614, 617, - 620, 623, 625, 628, 629, 631 + 224, 226, 228, 230, 232, 235, 236, 238, 240, 242, + 244, 246, 248, 251, 252, 254, 256, 258, 260, 263, + 266, 269, 272, 275, 278, 281, 284, 287, 290, 293, + 296, 299, 302, 305, 308, 311, 314, 317, 320, 323, + 326, 329, 332, 335, 338, 341, 344, 347, 350, 353, + 356, 359, 362, 365, 368, 371, 374, 377, 380, 383, + 386, 389, 392, 395, 398, 401, 404, 407, 410, 413, + 416, 419, 422, 425, 428, 431, 434, 437, 440, 443, + 446, 449, 452, 455, 458, 461, 464, 467, 470, 473, + 476, 479, 482, 485, 488, 492, 495, 498, 501, 504, + 507, 510, 513, 516, 519, 522, 525, 528, 531, 534, + 537, 540, 543, 546, 550, 553, 556, 559, 562, 565, + 568, 571, 574, 577, 580, 583, 586, 589, 592, 594, + 597, 598, 600, 602, 604, 606, 608, 610, 612, 615, + 618, 621, 624, 627, 630, 633, 635, 638, 639, 641 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 132, 0, -1, -1, 132, 133, -1, 134, 135, -1, - 137, 138, -1, 140, 141, -1, 261, 262, -1, 251, - 252, -1, 11, -1, 135, 136, -1, -1, 143, -1, - 144, -1, 148, -1, 151, -1, 157, -1, 158, -1, - 159, -1, 160, -1, 149, -1, 170, -1, 171, -1, - 172, -1, 173, -1, 174, -1, 191, -1, 192, -1, - 193, -1, 195, -1, 196, -1, 154, -1, 197, -1, - 198, -1, 201, -1, 199, -1, 200, -1, 202, -1, - 203, -1, 204, -1, 215, -1, 183, -1, 184, -1, - 185, -1, 186, -1, 205, -1, 218, -1, 179, -1, - 181, -1, 219, -1, 224, -1, 225, -1, 226, -1, - 155, -1, 190, -1, 233, -1, 234, -1, 180, -1, - 229, -1, 167, -1, 150, -1, 175, -1, 216, -1, - 222, -1, 206, -1, 217, -1, 236, -1, 237, -1, - 156, -1, 145, -1, 166, -1, 209, -1, 146, -1, - 152, -1, 153, -1, 176, -1, 177, -1, 235, -1, - 208, -1, 210, -1, 211, -1, 147, -1, 238, -1, - 194, -1, 214, -1, 168, -1, 182, -1, 220, -1, - 221, -1, 223, -1, 228, -1, 178, -1, 230, -1, - 231, -1, 232, -1, 187, -1, 189, -1, 212, -1, - 213, -1, 188, -1, 207, -1, 227, -1, 169, -1, - 161, -1, 162, -1, 163, -1, 164, -1, 165, -1, - 239, -1, 240, -1, 241, -1, 38, -1, 138, 139, - -1, -1, 242, -1, 243, -1, 244, -1, 246, -1, - 245, -1, 44, -1, 141, 142, -1, -1, 247, -1, - 248, -1, 249, -1, 250, -1, 13, 10, -1, 12, - 10, -1, 76, 10, -1, 79, 10, -1, 96, 10, - -1, 14, 10, -1, 16, 10, -1, 67, 10, -1, - 15, 10, -1, 80, 10, -1, 81, 10, -1, 31, - 10, -1, 60, 10, -1, 75, 10, -1, 17, 10, - -1, 18, 10, -1, 19, 10, -1, 20, 10, -1, - 121, 10, -1, 122, 10, -1, 123, 10, -1, 124, - 10, -1, 125, 10, -1, 77, 10, -1, 66, 10, - -1, 101, 10, -1, 120, 10, -1, 21, 10, -1, - 22, 10, -1, 23, 10, -1, 24, 10, -1, 25, - 10, -1, 68, 10, -1, 82, 10, -1, 83, 10, - -1, 109, 10, -1, 54, 10, -1, 64, 10, -1, - 55, 10, -1, 102, 10, -1, 48, 10, -1, 49, - 10, -1, 50, 10, -1, 51, 10, -1, 113, 10, - -1, 117, 10, -1, 114, 10, -1, 61, 10, -1, - 26, 10, -1, 27, 10, -1, 28, 10, -1, 98, + 134, 0, -1, -1, 134, 135, -1, 136, 137, -1, + 139, 140, -1, 142, 143, -1, 265, 266, -1, 255, + 256, -1, 11, -1, 137, 138, -1, -1, 145, -1, + 146, -1, 150, -1, 153, -1, 159, -1, 160, -1, + 161, -1, 162, -1, 151, -1, 172, -1, 173, -1, + 174, -1, 175, -1, 176, -1, 194, -1, 195, -1, + 196, -1, 199, -1, 200, -1, 156, -1, 201, -1, + 202, -1, 205, -1, 203, -1, 204, -1, 206, -1, + 207, -1, 208, -1, 219, -1, 185, -1, 186, -1, + 187, -1, 188, -1, 209, -1, 222, -1, 181, -1, + 183, -1, 223, -1, 228, -1, 229, -1, 230, -1, + 157, -1, 193, -1, 237, -1, 238, -1, 182, -1, + 233, -1, 169, -1, 152, -1, 177, -1, 220, -1, + 226, -1, 210, -1, 221, -1, 240, -1, 241, -1, + 158, -1, 147, -1, 168, -1, 213, -1, 148, -1, + 154, -1, 155, -1, 178, -1, 179, -1, 239, -1, + 212, -1, 214, -1, 215, -1, 149, -1, 242, -1, + 197, -1, 218, -1, 170, -1, 184, -1, 224, -1, + 225, -1, 227, -1, 232, -1, 180, -1, 234, -1, + 235, -1, 236, -1, 189, -1, 192, -1, 216, -1, + 217, -1, 190, -1, 211, -1, 231, -1, 171, -1, + 163, -1, 164, -1, 165, -1, 166, -1, 167, -1, + 243, -1, 244, -1, 245, -1, 191, -1, 198, -1, + 38, -1, 140, 141, -1, -1, 246, -1, 247, -1, + 248, -1, 250, -1, 249, -1, 44, -1, 143, 144, + -1, -1, 251, -1, 252, -1, 253, -1, 254, -1, + 13, 10, -1, 12, 10, -1, 76, 10, -1, 79, + 10, -1, 96, 10, -1, 14, 10, -1, 16, 10, + -1, 67, 10, -1, 15, 10, -1, 80, 10, -1, + 81, 10, -1, 31, 10, -1, 60, 10, -1, 75, + 10, -1, 17, 10, -1, 18, 10, -1, 19, 10, + -1, 20, 10, -1, 122, 10, -1, 123, 10, -1, + 124, 10, -1, 125, 10, -1, 126, 10, -1, 77, + 10, -1, 66, 10, -1, 101, 10, -1, 121, 10, + -1, 21, 10, -1, 22, 10, -1, 23, 10, -1, + 24, 10, -1, 25, 10, -1, 68, 10, -1, 82, + 10, -1, 83, 10, -1, 109, 10, -1, 54, 10, + -1, 64, 10, -1, 55, 10, -1, 102, 10, -1, + 48, 10, -1, 49, 10, -1, 50, 10, -1, 51, + 10, -1, 113, 10, -1, 117, 10, -1, 118, 10, + -1, 114, 10, -1, 61, 10, -1, 26, 10, -1, + 27, 10, -1, 28, 10, -1, 98, 10, -1, 132, 10, -1, 29, 10, -1, 30, 10, -1, 32, 10, -1, 33, 10, -1, 35, 10, -1, 36, 10, -1, 34, 10, -1, 41, 10, -1, 42, 10, -1, 43, - 10, -1, 52, 10, -1, 71, 10, -1, 118, 10, + 10, -1, 52, 10, -1, 71, 10, -1, 119, 10, -1, 85, 10, -1, 78, 10, -1, 86, 10, -1, 87, 10, -1, 115, 10, -1, 116, 10, -1, 100, 10, -1, 47, 10, -1, 69, 10, -1, 72, 10, 10, -1, 53, 10, -1, 56, 10, -1, 105, 10, -1, 106, 10, -1, 70, 10, -1, 107, 10, -1, - 57, 10, -1, 58, 10, -1, 59, 10, -1, 119, + 57, 10, -1, 58, 10, -1, 59, 10, -1, 120, 10, -1, 108, 10, -1, 65, 10, -1, 111, 10, -1, 112, 10, -1, 110, 10, -1, 62, 10, -1, 63, 10, -1, 84, 10, -1, 73, 10, 10, -1, - 74, 10, -1, 97, 10, -1, 128, 10, -1, 129, - 10, -1, 130, 10, -1, 37, 10, -1, 39, 10, - -1, 40, 10, -1, 127, 10, -1, 99, 10, -1, - 37, 10, -1, 45, 10, -1, 46, 10, -1, 126, - 10, -1, 88, -1, 252, 253, -1, -1, 254, -1, - 256, -1, 255, -1, 257, -1, 258, -1, 259, -1, - 260, -1, 89, 10, -1, 91, 10, -1, 90, 10, + 74, 10, -1, 97, 10, -1, 129, 10, -1, 130, + 10, -1, 131, 10, -1, 37, 10, -1, 39, 10, + -1, 40, 10, -1, 128, 10, -1, 99, 10, -1, + 37, 10, -1, 45, 10, -1, 46, 10, -1, 127, + 10, -1, 88, -1, 256, 257, -1, -1, 258, -1, + 260, -1, 259, -1, 261, -1, 262, -1, 263, -1, + 264, -1, 89, 10, -1, 91, 10, -1, 90, 10, -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, - 95, 10, -1, 103, -1, 262, 263, -1, -1, 264, + 95, 10, -1, 103, -1, 266, 267, -1, -1, 268, -1, 104, 10, -1 }; @@ -825,21 +830,21 @@ static const yytype_uint16 yyrline[] = 154, 154, 155, 155, 156, 156, 157, 157, 158, 158, 158, 159, 159, 160, 160, 160, 161, 161, 161, 162, 162, 162, 163, 163, 163, 164, 164, 164, 165, 165, - 165, 167, 179, 180, 181, 181, 181, 181, 181, 183, - 195, 196, 197, 197, 197, 197, 199, 208, 217, 228, - 237, 246, 255, 268, 283, 292, 301, 310, 319, 328, - 337, 346, 355, 364, 373, 382, 391, 398, 405, 414, - 423, 437, 446, 455, 462, 469, 476, 484, 491, 498, - 505, 512, 520, 528, 536, 543, 550, 559, 568, 575, - 582, 590, 598, 611, 622, 630, 643, 652, 661, 669, - 682, 691, 699, 708, 716, 729, 736, 746, 756, 766, - 776, 786, 796, 806, 813, 820, 829, 838, 847, 854, - 864, 878, 885, 903, 916, 929, 938, 947, 956, 966, - 976, 985, 994, 1001, 1010, 1019, 1028, 1036, 1049, 1057, - 1079, 1086, 1101, 1111, 1121, 1128, 1138, 1145, 1152, 1161, - 1171, 1181, 1188, 1195, 1204, 1209, 1210, 1211, 1211, 1211, - 1212, 1212, 1212, 1213, 1215, 1225, 1234, 1241, 1248, 1255, - 1262, 1269, 1274, 1275, 1276, 1278 + 165, 166, 166, 168, 180, 181, 182, 182, 182, 182, + 182, 184, 196, 197, 198, 198, 198, 198, 200, 209, + 218, 229, 238, 247, 256, 269, 284, 293, 302, 311, + 320, 329, 338, 347, 356, 365, 374, 383, 392, 399, + 406, 415, 424, 438, 447, 456, 463, 470, 477, 485, + 492, 499, 506, 513, 521, 529, 537, 544, 551, 560, + 569, 576, 583, 591, 599, 609, 622, 633, 641, 654, + 663, 672, 681, 689, 702, 711, 719, 728, 736, 749, + 756, 766, 776, 786, 796, 806, 816, 826, 833, 840, + 849, 858, 867, 874, 884, 901, 908, 926, 939, 952, + 961, 970, 979, 989, 999, 1008, 1017, 1024, 1033, 1042, + 1051, 1059, 1072, 1080, 1102, 1109, 1124, 1134, 1144, 1151, + 1161, 1168, 1175, 1184, 1194, 1204, 1211, 1218, 1227, 1232, + 1233, 1234, 1234, 1234, 1235, 1235, 1235, 1236, 1238, 1248, + 1257, 1264, 1271, 1278, 1285, 1292, 1297, 1298, 1299, 1301 }; #endif @@ -885,21 +890,22 @@ static const char *const yytname[] = "VAR_VAL_LOG_LEVEL", "VAR_AUTO_TRUST_ANCHOR_FILE", "VAR_KEEP_MISSING", "VAR_ADD_HOLDDOWN", "VAR_DEL_HOLDDOWN", "VAR_SO_RCVBUF", "VAR_EDNS_BUFFER_SIZE", "VAR_PREFETCH", "VAR_PREFETCH_KEY", - "VAR_SO_SNDBUF", "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_FIRST", "VAR_MINIMAL_RESPONSES", - "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "$accept", "toplevelvars", - "toplevelvar", "serverstart", "contents_server", "content_server", - "stubstart", "contents_stub", "content_stub", "forwardstart", - "contents_forward", "content_forward", "server_num_threads", - "server_verbosity", "server_statistics_interval", - "server_statistics_cumulative", "server_extended_statistics", - "server_port", "server_interface", "server_outgoing_interface", - "server_outgoing_range", "server_outgoing_port_permit", - "server_outgoing_port_avoid", "server_outgoing_num_tcp", - "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", - "server_do_ip6", "server_do_udp", "server_do_tcp", "server_tcp_upstream", + "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_FIRST", + "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", + "VAR_DELAY_CLOSE", "$accept", "toplevelvars", "toplevelvar", + "serverstart", "contents_server", "content_server", "stubstart", + "contents_stub", "content_stub", "forwardstart", "contents_forward", + "content_forward", "server_num_threads", "server_verbosity", + "server_statistics_interval", "server_statistics_cumulative", + "server_extended_statistics", "server_port", "server_interface", + "server_outgoing_interface", "server_outgoing_range", + "server_outgoing_port_permit", "server_outgoing_port_avoid", + "server_outgoing_num_tcp", "server_incoming_num_tcp", + "server_interface_automatic", "server_do_ip4", "server_do_ip6", + "server_do_udp", "server_do_tcp", "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", @@ -909,10 +915,11 @@ static const char *const yytname[] = "server_trust_anchor_file", "server_trusted_keys_file", "server_trust_anchor", "server_domain_insecure", "server_hide_identity", "server_hide_version", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_edns_buffer_size", - "server_msg_buffer_size", "server_msg_cache_size", - "server_msg_cache_slabs", "server_num_queries_per_thread", - "server_jostle_timeout", "server_rrset_cache_size", + "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", + "server_edns_buffer_size", "server_msg_buffer_size", + "server_msg_cache_size", "server_msg_cache_slabs", + "server_num_queries_per_thread", "server_jostle_timeout", + "server_delay_close", "server_rrset_cache_size", "server_rrset_cache_slabs", "server_infra_host_ttl", "server_infra_lame_ttl", "server_infra_cache_numhosts", "server_infra_cache_lame_size", "server_infra_cache_slabs", @@ -961,26 +968,26 @@ static const yytype_uint16 yytoknum[] = 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385 + 385, 386, 387 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 131, 132, 132, 133, 133, 133, 133, 133, 134, - 135, 135, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 137, 138, 138, 139, 139, 139, 139, 139, 140, - 141, 141, 142, 142, 142, 142, 143, 144, 145, 146, + 0, 133, 134, 134, 135, 135, 135, 135, 135, 136, + 137, 137, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 138, 138, 138, 139, 140, 140, 141, 141, 141, 141, + 141, 142, 143, 143, 144, 144, 144, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, @@ -991,9 +998,9 @@ static const yytype_uint16 yyr1[] = 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, 252, 253, 253, 253, - 253, 253, 253, 253, 254, 255, 256, 257, 258, 259, - 260, 261, 262, 262, 263, 264 + 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, + 256, 257, 257, 257, 257, 257, 257, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 266, 267, 268 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1010,8 +1017,8 @@ 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, 2, 0, 1, 1, 1, 1, 1, 1, - 2, 0, 1, 1, 1, 1, 2, 2, 2, 2, + 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, @@ -1019,21 +1026,21 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, + 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, - 2, 1, 2, 0, 1, 2 + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 2, 1, 2, 0, 1, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const yytype_uint8 yydefact[] = +static const yytype_uint16 yydefact[] = { - 2, 0, 1, 9, 111, 119, 234, 251, 3, 11, - 113, 121, 236, 253, 4, 5, 6, 8, 7, 0, + 2, 0, 1, 9, 113, 121, 238, 255, 3, 11, + 115, 123, 240, 257, 4, 5, 6, 8, 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, 0, 0, 0, 0, 0, 0, @@ -1043,52 +1050,52 @@ static const yytype_uint8 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, 10, 12, - 13, 69, 72, 81, 14, 20, 60, 15, 73, 74, - 31, 53, 68, 16, 17, 18, 19, 103, 104, 105, - 106, 107, 70, 59, 85, 102, 21, 22, 23, 24, - 25, 61, 75, 76, 91, 47, 57, 48, 86, 41, - 42, 43, 44, 95, 99, 96, 54, 26, 27, 28, - 83, 29, 30, 32, 33, 35, 36, 34, 37, 38, - 39, 45, 64, 100, 78, 71, 79, 80, 97, 98, - 84, 40, 62, 65, 46, 49, 87, 88, 63, 89, - 50, 51, 52, 101, 90, 58, 92, 93, 94, 55, - 56, 77, 66, 67, 82, 108, 109, 110, 0, 0, - 0, 0, 0, 112, 114, 115, 116, 118, 117, 0, - 0, 0, 0, 120, 122, 123, 124, 125, 0, 0, - 0, 0, 0, 0, 0, 235, 237, 239, 238, 240, - 241, 242, 243, 0, 252, 254, 127, 126, 131, 134, - 132, 140, 141, 142, 143, 153, 154, 155, 156, 157, - 174, 175, 176, 178, 179, 137, 180, 181, 184, 182, - 183, 185, 186, 187, 198, 166, 167, 168, 169, 188, - 201, 162, 164, 202, 207, 208, 209, 138, 173, 216, - 217, 163, 212, 150, 133, 158, 199, 205, 189, 0, - 0, 220, 139, 128, 149, 192, 129, 135, 136, 159, - 160, 218, 191, 193, 194, 130, 221, 177, 197, 151, - 165, 203, 204, 206, 211, 161, 215, 213, 214, 170, - 172, 195, 196, 171, 190, 210, 152, 144, 145, 146, - 147, 148, 222, 223, 224, 225, 226, 227, 229, 228, - 230, 231, 232, 233, 244, 246, 245, 247, 248, 249, - 250, 255, 200, 219 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 10, 12, 13, 69, 72, 81, 14, 20, 60, 15, + 73, 74, 31, 53, 68, 16, 17, 18, 19, 103, + 104, 105, 106, 107, 70, 59, 85, 102, 21, 22, + 23, 24, 25, 61, 75, 76, 91, 47, 57, 48, + 86, 41, 42, 43, 44, 95, 99, 111, 96, 54, + 26, 27, 28, 83, 112, 29, 30, 32, 33, 35, + 36, 34, 37, 38, 39, 45, 64, 100, 78, 71, + 79, 80, 97, 98, 84, 40, 62, 65, 46, 49, + 87, 88, 63, 89, 50, 51, 52, 101, 90, 58, + 92, 93, 94, 55, 56, 77, 66, 67, 82, 108, + 109, 110, 0, 0, 0, 0, 0, 114, 116, 117, + 118, 120, 119, 0, 0, 0, 0, 122, 124, 125, + 126, 127, 0, 0, 0, 0, 0, 0, 0, 239, + 241, 243, 242, 244, 245, 246, 247, 0, 256, 258, + 129, 128, 133, 136, 134, 142, 143, 144, 145, 155, + 156, 157, 158, 159, 177, 178, 179, 182, 183, 139, + 184, 185, 188, 186, 187, 189, 190, 191, 202, 168, + 169, 170, 171, 192, 205, 164, 166, 206, 211, 212, + 213, 140, 176, 220, 221, 165, 216, 152, 135, 160, + 203, 209, 193, 0, 0, 224, 141, 130, 151, 196, + 131, 137, 138, 161, 162, 222, 195, 197, 198, 132, + 225, 180, 201, 153, 167, 207, 208, 210, 215, 163, + 219, 217, 218, 172, 175, 199, 200, 173, 174, 194, + 214, 154, 146, 147, 148, 149, 150, 226, 227, 228, + 181, 229, 230, 231, 233, 232, 234, 235, 236, 237, + 248, 250, 249, 251, 252, 253, 254, 259, 204, 223 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 8, 9, 14, 118, 10, 15, 223, 11, - 16, 233, 119, 120, 121, 122, 123, 124, 125, 126, - 127, 128, 129, 130, 131, 132, 133, 134, 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, 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, 224, 225, 226, 227, 228, 234, 235, 236, 237, - 12, 17, 245, 246, 247, 248, 249, 250, 251, 252, - 13, 18, 254, 255 + -1, 1, 8, 9, 14, 120, 10, 15, 227, 11, + 16, 237, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 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, 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, 228, 229, 230, 231, 232, 238, 239, + 240, 241, 12, 17, 249, 250, 251, 252, 253, 254, + 255, 256, 13, 18, 258, 259 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1096,18 +1103,20 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -80 static const yytype_int16 yypact[] = { - -80, 76, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -12, 40, 46, 32, -79, 16, - 17, 18, 22, 23, 24, 68, 71, 72, 105, 109, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, 152, 153, 155, 156, 158, 159, 160, - 161, 163, 164, 165, 166, 167, 168, 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, -80, -80, + -80, 115, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -12, 39, 46, 38, -79, 16, + 17, 18, 22, 23, 24, 67, 70, 71, 72, 77, + 106, 111, 112, 113, 114, 124, 125, 126, 127, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 144, 145, 146, 147, 148, 150, 151, + 152, 153, 154, 155, 156, 158, 159, 160, 161, 162, + 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, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, @@ -1116,24 +1125,22 @@ static const yytype_int16 yypact[] = -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, 216, 217, 218, 219, 220, -80, -80, -80, + -80, -80, -80, 221, 222, 223, 224, -80, -80, -80, + -80, -80, 225, 226, 227, 228, 229, 230, 231, -80, + -80, -80, -80, -80, -80, -80, -80, 232, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80, -80, 211, 212, - 213, 214, 215, -80, -80, -80, -80, -80, -80, 216, - 217, 218, 219, -80, -80, -80, -80, -80, 220, 221, - 222, 223, 224, 225, 226, -80, -80, -80, -80, -80, - -80, -80, -80, 227, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80, -80, -80, -80, -80, -80, 228, - 229, -80, -80, -80, -80, -80, -80, -80, -80, -80, + -80, -80, -80, 233, 234, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80 + -80, -80, -80, -80, -80, -80, -80, -80, -80, -80 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1152,7 +1159,7 @@ static const yytype_int8 yypgoto[] = -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, -80, - -80, -80, -80, -80 + -80, -80, -80, -80, -80, -80 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1163,28 +1170,29 @@ static const yytype_uint16 yytable[] = { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 253, 256, 257, 258, 44, - 45, 46, 259, 260, 261, 47, 48, 49, 50, 51, + 39, 40, 41, 42, 43, 257, 260, 261, 262, 44, + 45, 46, 263, 264, 265, 47, 48, 49, 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, 2, 218, 262, 219, - 220, 263, 264, 229, 88, 89, 90, 3, 91, 92, - 93, 230, 231, 94, 95, 96, 97, 98, 99, 100, + 82, 83, 84, 85, 86, 87, 222, 266, 223, 224, + 267, 268, 269, 233, 88, 89, 90, 270, 91, 92, + 93, 234, 235, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 4, 265, 115, 116, 117, 266, - 5, 238, 239, 240, 241, 242, 243, 244, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 221, - 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, - 298, 299, 300, 301, 6, 302, 303, 222, 304, 305, - 306, 307, 232, 308, 309, 310, 311, 312, 313, 7, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, - 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, - 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373 + 111, 112, 113, 114, 115, 2, 271, 116, 117, 118, + 119, 272, 273, 274, 275, 0, 3, 242, 243, 244, + 245, 246, 247, 248, 276, 277, 278, 279, 225, 280, + 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, + 291, 292, 293, 4, 294, 295, 296, 297, 298, 5, + 299, 300, 301, 302, 303, 304, 305, 226, 306, 307, + 308, 309, 310, 236, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, + 337, 338, 339, 6, 340, 341, 342, 343, 344, 345, + 346, 347, 348, 349, 350, 351, 352, 353, 7, 354, + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379 }; #define yypact_value_is_default(yystate) \ @@ -1193,7 +1201,7 @@ static const yytype_uint16 yytable[] = #define yytable_value_is_error(yytable_value) \ YYID (0) -static const yytype_uint8 yycheck[] = +static const yytype_int16 yycheck[] = { 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -1202,31 +1210,32 @@ static const yytype_uint8 yycheck[] = 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, 0, 37, 10, 39, - 40, 10, 10, 37, 96, 97, 98, 11, 100, 101, + 82, 83, 84, 85, 86, 87, 37, 10, 39, 40, + 10, 10, 10, 37, 96, 97, 98, 10, 100, 101, 102, 45, 46, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 38, 10, 128, 129, 130, 10, - 44, 89, 90, 91, 92, 93, 94, 95, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 99, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 88, 10, 10, 127, 10, 10, - 10, 10, 126, 10, 10, 10, 10, 10, 10, 103, + 122, 123, 124, 125, 126, 0, 10, 129, 130, 131, + 132, 10, 10, 10, 10, -1, 11, 89, 90, 91, + 92, 93, 94, 95, 10, 10, 10, 10, 99, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 38, 10, 10, 10, 10, 10, 44, + 10, 10, 10, 10, 10, 10, 10, 128, 10, 10, + 10, 10, 10, 127, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 88, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 103, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 132, 0, 11, 38, 44, 88, 103, 133, 134, - 137, 140, 251, 261, 135, 138, 141, 252, 262, 12, + 0, 134, 0, 11, 38, 44, 88, 103, 135, 136, + 139, 142, 255, 265, 137, 140, 143, 256, 266, 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, 41, 42, 43, 47, 48, 49, @@ -1236,8 +1245,8 @@ static const yytype_uint16 yystos[] = 80, 81, 82, 83, 84, 85, 86, 87, 96, 97, 98, 100, 101, 102, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 125, 128, 129, 130, 136, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 121, 122, 123, 124, 125, 126, 129, 130, 131, 132, + 138, 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, @@ -1246,11 +1255,11 @@ static const yytype_uint16 yystos[] = 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, 37, 39, - 40, 99, 127, 139, 242, 243, 244, 245, 246, 37, - 45, 46, 126, 142, 247, 248, 249, 250, 89, 90, - 91, 92, 93, 94, 95, 253, 254, 255, 256, 257, - 258, 259, 260, 104, 263, 264, 10, 10, 10, 10, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 37, 39, 40, 99, 128, 141, 246, 247, + 248, 249, 250, 37, 45, 46, 127, 144, 251, 252, + 253, 254, 89, 90, 91, 92, 93, 94, 95, 257, + 258, 259, 260, 261, 262, 263, 264, 104, 267, 268, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1262,7 +1271,7 @@ 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 }; #define yyerrok (yyerrstatus = 0) @@ -2093,9 +2102,9 @@ yyreduce: } break; - case 111: + case 113: /* Line 1787 of yacc.c */ -#line 168 "util/configparser.y" +#line 169 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2108,9 +2117,9 @@ yyreduce: } break; - case 119: + case 121: /* Line 1787 of yacc.c */ -#line 184 "util/configparser.y" +#line 185 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2123,9 +2132,9 @@ yyreduce: } break; - case 126: + case 128: /* Line 1787 of yacc.c */ -#line 200 "util/configparser.y" +#line 201 "util/configparser.y" { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2135,9 +2144,9 @@ yyreduce: } break; - case 127: + case 129: /* Line 1787 of yacc.c */ -#line 209 "util/configparser.y" +#line 210 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2147,9 +2156,9 @@ yyreduce: } break; - case 128: + case 130: /* Line 1787 of yacc.c */ -#line 218 "util/configparser.y" +#line 219 "util/configparser.y" { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) @@ -2161,9 +2170,9 @@ yyreduce: } break; - case 129: + case 131: /* Line 1787 of yacc.c */ -#line 229 "util/configparser.y" +#line 230 "util/configparser.y" { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2173,9 +2182,9 @@ yyreduce: } break; - case 130: + case 132: /* Line 1787 of yacc.c */ -#line 238 "util/configparser.y" +#line 239 "util/configparser.y" { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2185,9 +2194,9 @@ yyreduce: } break; - case 131: + case 133: /* Line 1787 of yacc.c */ -#line 247 "util/configparser.y" +#line 248 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2197,9 +2206,9 @@ yyreduce: } break; - case 132: + case 134: /* Line 1787 of yacc.c */ -#line 256 "util/configparser.y" +#line 257 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2213,9 +2222,9 @@ yyreduce: } break; - case 133: + case 135: /* Line 1787 of yacc.c */ -#line 269 "util/configparser.y" +#line 270 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2231,9 +2240,9 @@ yyreduce: } break; - case 134: + case 136: /* Line 1787 of yacc.c */ -#line 284 "util/configparser.y" +#line 285 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2243,9 +2252,9 @@ yyreduce: } break; - case 135: + case 137: /* Line 1787 of yacc.c */ -#line 293 "util/configparser.y" +#line 294 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, @@ -2255,9 +2264,9 @@ yyreduce: } break; - case 136: + case 138: /* Line 1787 of yacc.c */ -#line 302 "util/configparser.y" +#line 303 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, @@ -2267,9 +2276,9 @@ yyreduce: } break; - case 137: + case 139: /* Line 1787 of yacc.c */ -#line 311 "util/configparser.y" +#line 312 "util/configparser.y" { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2279,9 +2288,9 @@ yyreduce: } break; - case 138: + case 140: /* Line 1787 of yacc.c */ -#line 320 "util/configparser.y" +#line 321 "util/configparser.y" { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2291,9 +2300,9 @@ yyreduce: } break; - case 139: + case 141: /* Line 1787 of yacc.c */ -#line 329 "util/configparser.y" +#line 330 "util/configparser.y" { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2303,9 +2312,9 @@ yyreduce: } break; - case 140: + case 142: /* Line 1787 of yacc.c */ -#line 338 "util/configparser.y" +#line 339 "util/configparser.y" { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2315,9 +2324,9 @@ yyreduce: } break; - case 141: + case 143: /* Line 1787 of yacc.c */ -#line 347 "util/configparser.y" +#line 348 "util/configparser.y" { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2327,9 +2336,9 @@ yyreduce: } break; - case 142: + case 144: /* Line 1787 of yacc.c */ -#line 356 "util/configparser.y" +#line 357 "util/configparser.y" { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2339,9 +2348,9 @@ yyreduce: } break; - case 143: + case 145: /* Line 1787 of yacc.c */ -#line 365 "util/configparser.y" +#line 366 "util/configparser.y" { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2351,9 +2360,9 @@ yyreduce: } break; - case 144: + case 146: /* Line 1787 of yacc.c */ -#line 374 "util/configparser.y" +#line 375 "util/configparser.y" { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2363,9 +2372,9 @@ yyreduce: } break; - case 145: + case 147: /* Line 1787 of yacc.c */ -#line 383 "util/configparser.y" +#line 384 "util/configparser.y" { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2375,9 +2384,9 @@ yyreduce: } break; - case 146: + case 148: /* Line 1787 of yacc.c */ -#line 392 "util/configparser.y" +#line 393 "util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_key); @@ -2385,9 +2394,9 @@ yyreduce: } break; - case 147: + case 149: /* Line 1787 of yacc.c */ -#line 399 "util/configparser.y" +#line 400 "util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_pem); @@ -2395,9 +2404,9 @@ yyreduce: } break; - case 148: + case 150: /* Line 1787 of yacc.c */ -#line 406 "util/configparser.y" +#line 407 "util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2407,9 +2416,9 @@ yyreduce: } break; - case 149: + case 151: /* Line 1787 of yacc.c */ -#line 415 "util/configparser.y" +#line 416 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2419,9 +2428,9 @@ yyreduce: } break; - case 150: + case 152: /* Line 1787 of yacc.c */ -#line 424 "util/configparser.y" +#line 425 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2436,9 +2445,9 @@ yyreduce: } break; - case 151: + case 153: /* Line 1787 of yacc.c */ -#line 438 "util/configparser.y" +#line 439 "util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2448,9 +2457,9 @@ yyreduce: } break; - case 152: + case 154: /* Line 1787 of yacc.c */ -#line 447 "util/configparser.y" +#line 448 "util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2460,9 +2469,9 @@ yyreduce: } break; - case 153: + case 155: /* Line 1787 of yacc.c */ -#line 456 "util/configparser.y" +#line 457 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2470,9 +2479,9 @@ yyreduce: } break; - case 154: + case 156: /* Line 1787 of yacc.c */ -#line 463 "util/configparser.y" +#line 464 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2480,9 +2489,9 @@ yyreduce: } break; - case 155: + case 157: /* Line 1787 of yacc.c */ -#line 470 "util/configparser.y" +#line 471 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2490,9 +2499,9 @@ yyreduce: } break; - case 156: + case 158: /* Line 1787 of yacc.c */ -#line 477 "util/configparser.y" +#line 478 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2501,9 +2510,9 @@ yyreduce: } break; - case 157: + case 159: /* Line 1787 of yacc.c */ -#line 485 "util/configparser.y" +#line 486 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2511,9 +2520,9 @@ yyreduce: } break; - case 158: + case 160: /* Line 1787 of yacc.c */ -#line 492 "util/configparser.y" +#line 493 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str))) @@ -2521,9 +2530,9 @@ yyreduce: } break; - case 159: + case 161: /* Line 1787 of yacc.c */ -#line 499 "util/configparser.y" +#line 500 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2531,9 +2540,9 @@ yyreduce: } break; - case 160: + case 162: /* Line 1787 of yacc.c */ -#line 506 "util/configparser.y" +#line 507 "util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str))) @@ -2541,9 +2550,9 @@ yyreduce: } break; - case 161: + case 163: /* Line 1787 of yacc.c */ -#line 513 "util/configparser.y" +#line 514 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2552,9 +2561,9 @@ yyreduce: } break; - case 162: + case 164: /* Line 1787 of yacc.c */ -#line 521 "util/configparser.y" +#line 522 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2563,9 +2572,9 @@ yyreduce: } break; - case 163: + case 165: /* Line 1787 of yacc.c */ -#line 529 "util/configparser.y" +#line 530 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2574,9 +2583,9 @@ yyreduce: } break; - case 164: + case 166: /* Line 1787 of yacc.c */ -#line 537 "util/configparser.y" +#line 538 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str))) @@ -2584,9 +2593,9 @@ yyreduce: } break; - case 165: + case 167: /* Line 1787 of yacc.c */ -#line 544 "util/configparser.y" +#line 545 "util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str))) @@ -2594,9 +2603,9 @@ yyreduce: } break; - case 166: + case 168: /* Line 1787 of yacc.c */ -#line 551 "util/configparser.y" +#line 552 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2606,9 +2615,9 @@ yyreduce: } break; - case 167: + case 169: /* Line 1787 of yacc.c */ -#line 560 "util/configparser.y" +#line 561 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2618,9 +2627,9 @@ yyreduce: } break; - case 168: + case 170: /* Line 1787 of yacc.c */ -#line 569 "util/configparser.y" +#line 570 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2628,9 +2637,9 @@ yyreduce: } break; - case 169: + case 171: /* Line 1787 of yacc.c */ -#line 576 "util/configparser.y" +#line 577 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2638,9 +2647,9 @@ yyreduce: } break; - case 170: + case 172: /* Line 1787 of yacc.c */ -#line 583 "util/configparser.y" +#line 584 "util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_rcvbuf)) @@ -2649,9 +2658,9 @@ yyreduce: } break; - case 171: + case 173: /* Line 1787 of yacc.c */ -#line 591 "util/configparser.y" +#line 592 "util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_sndbuf)) @@ -2660,9 +2669,22 @@ yyreduce: } break; - case 172: + case 174: +/* Line 1787 of yacc.c */ +#line 600 "util/configparser.y" + { + OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[(2) - (2)].str))); + if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->so_reuseport = + (strcmp((yyvsp[(2) - (2)].str), "yes")==0); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 175: /* Line 1787 of yacc.c */ -#line 599 "util/configparser.y" +#line 610 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2676,9 +2698,9 @@ yyreduce: } break; - case 173: + case 176: /* Line 1787 of yacc.c */ -#line 612 "util/configparser.y" +#line 623 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2690,9 +2712,9 @@ yyreduce: } break; - case 174: + case 177: /* Line 1787 of yacc.c */ -#line 623 "util/configparser.y" +#line 634 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size)) @@ -2701,9 +2723,9 @@ yyreduce: } break; - case 175: + case 178: /* Line 1787 of yacc.c */ -#line 631 "util/configparser.y" +#line 642 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2717,9 +2739,9 @@ yyreduce: } break; - case 176: + case 179: /* Line 1787 of yacc.c */ -#line 644 "util/configparser.y" +#line 655 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2729,9 +2751,9 @@ yyreduce: } break; - case 177: + case 180: /* Line 1787 of yacc.c */ -#line 653 "util/configparser.y" +#line 664 "util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2741,9 +2763,21 @@ yyreduce: } break; - case 178: + case 181: +/* Line 1787 of yacc.c */ +#line 673 "util/configparser.y" + { + OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str))); + if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) + yyerror("number expected"); + else cfg_parser->cfg->delay_close = atoi((yyvsp[(2) - (2)].str)); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 182: /* Line 1787 of yacc.c */ -#line 662 "util/configparser.y" +#line 682 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size)) @@ -2752,9 +2786,9 @@ yyreduce: } break; - case 179: + case 183: /* Line 1787 of yacc.c */ -#line 670 "util/configparser.y" +#line 690 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2768,9 +2802,9 @@ yyreduce: } break; - case 180: + case 184: /* Line 1787 of yacc.c */ -#line 683 "util/configparser.y" +#line 703 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2780,9 +2814,9 @@ yyreduce: } break; - case 181: + case 185: /* Line 1787 of yacc.c */ -#line 692 "util/configparser.y" +#line 712 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -2791,9 +2825,9 @@ yyreduce: } break; - case 182: + case 186: /* Line 1787 of yacc.c */ -#line 700 "util/configparser.y" +#line 720 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2803,9 +2837,9 @@ yyreduce: } break; - case 183: + case 187: /* Line 1787 of yacc.c */ -#line 709 "util/configparser.y" +#line 729 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " @@ -2814,9 +2848,9 @@ yyreduce: } break; - case 184: + case 188: /* Line 1787 of yacc.c */ -#line 717 "util/configparser.y" +#line 737 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2830,9 +2864,9 @@ yyreduce: } break; - case 185: + case 189: /* Line 1787 of yacc.c */ -#line 730 "util/configparser.y" +#line 750 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -2840,9 +2874,9 @@ yyreduce: } break; - case 186: + case 190: /* Line 1787 of yacc.c */ -#line 737 "util/configparser.y" +#line 757 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2853,9 +2887,9 @@ yyreduce: } break; - case 187: + case 191: /* Line 1787 of yacc.c */ -#line 747 "util/configparser.y" +#line 767 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2866,9 +2900,9 @@ yyreduce: } break; - case 188: + case 192: /* Line 1787 of yacc.c */ -#line 757 "util/configparser.y" +#line 777 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2879,9 +2913,9 @@ yyreduce: } break; - case 189: + case 193: /* Line 1787 of yacc.c */ -#line 767 "util/configparser.y" +#line 787 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2892,9 +2926,9 @@ yyreduce: } break; - case 190: + case 194: /* Line 1787 of yacc.c */ -#line 777 "util/configparser.y" +#line 797 "util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2905,9 +2939,9 @@ yyreduce: } break; - case 191: + case 195: /* Line 1787 of yacc.c */ -#line 787 "util/configparser.y" +#line 807 "util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2918,9 +2952,9 @@ yyreduce: } break; - case 192: + case 196: /* Line 1787 of yacc.c */ -#line 797 "util/configparser.y" +#line 817 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2931,9 +2965,9 @@ yyreduce: } break; - case 193: + case 197: /* Line 1787 of yacc.c */ -#line 807 "util/configparser.y" +#line 827 "util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str))) @@ -2941,9 +2975,9 @@ yyreduce: } break; - case 194: + case 198: /* Line 1787 of yacc.c */ -#line 814 "util/configparser.y" +#line 834 "util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str))) @@ -2951,9 +2985,9 @@ yyreduce: } break; - case 195: + case 199: /* Line 1787 of yacc.c */ -#line 821 "util/configparser.y" +#line 841 "util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2963,9 +2997,9 @@ yyreduce: } break; - case 196: + case 200: /* Line 1787 of yacc.c */ -#line 830 "util/configparser.y" +#line 850 "util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2975,9 +3009,9 @@ yyreduce: } break; - case 197: + case 201: /* Line 1787 of yacc.c */ -#line 839 "util/configparser.y" +#line 859 "util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -2987,9 +3021,9 @@ yyreduce: } break; - case 198: + case 202: /* Line 1787 of yacc.c */ -#line 848 "util/configparser.y" +#line 868 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str))) @@ -2997,9 +3031,9 @@ yyreduce: } break; - case 199: + case 203: /* Line 1787 of yacc.c */ -#line 855 "util/configparser.y" +#line 875 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3010,15 +3044,18 @@ yyreduce: } break; - case 200: + case 204: /* Line 1787 of yacc.c */ -#line 865 "util/configparser.y" +#line 885 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 && + strcmp((yyvsp[(3) - (3)].str), "deny_non_local")!=0 && + strcmp((yyvsp[(3) - (3)].str), "refuse_non_local")!=0 && strcmp((yyvsp[(3) - (3)].str), "allow")!=0 && strcmp((yyvsp[(3) - (3)].str), "allow_snoop")!=0) { - yyerror("expected deny, refuse, allow or allow_snoop " + yyerror("expected deny, refuse, deny_non_local, " + "refuse_non_local, allow or allow_snoop " "in access control action"); } else { if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))) @@ -3027,9 +3064,9 @@ yyreduce: } break; - case 201: + case 205: /* Line 1787 of yacc.c */ -#line 879 "util/configparser.y" +#line 902 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -3037,9 +3074,9 @@ yyreduce: } break; - case 202: + case 206: /* Line 1787 of yacc.c */ -#line 886 "util/configparser.y" +#line 909 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3058,9 +3095,9 @@ yyreduce: } break; - case 203: + case 207: /* Line 1787 of yacc.c */ -#line 904 "util/configparser.y" +#line 927 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3074,9 +3111,9 @@ yyreduce: } break; - case 204: + case 208: /* Line 1787 of yacc.c */ -#line 917 "util/configparser.y" +#line 940 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str))); if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) { @@ -3090,9 +3127,9 @@ yyreduce: } break; - case 205: + case 209: /* Line 1787 of yacc.c */ -#line 930 "util/configparser.y" +#line 953 "util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3102,9 +3139,9 @@ yyreduce: } break; - case 206: + case 210: /* Line 1787 of yacc.c */ -#line 939 "util/configparser.y" +#line 962 "util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3114,9 +3151,9 @@ yyreduce: } break; - case 207: + case 211: /* Line 1787 of yacc.c */ -#line 948 "util/configparser.y" +#line 971 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3126,9 +3163,9 @@ yyreduce: } break; - case 208: + case 212: /* Line 1787 of yacc.c */ -#line 957 "util/configparser.y" +#line 980 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3139,9 +3176,9 @@ yyreduce: } break; - case 209: + case 213: /* Line 1787 of yacc.c */ -#line 967 "util/configparser.y" +#line 990 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3152,9 +3189,9 @@ yyreduce: } break; - case 210: + case 214: /* Line 1787 of yacc.c */ -#line 977 "util/configparser.y" +#line 1000 "util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3164,9 +3201,9 @@ yyreduce: } break; - case 211: + case 215: /* Line 1787 of yacc.c */ -#line 986 "util/configparser.y" +#line 1009 "util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3176,9 +3213,9 @@ yyreduce: } break; - case 212: + case 216: /* Line 1787 of yacc.c */ -#line 995 "util/configparser.y" +#line 1018 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -3186,9 +3223,9 @@ yyreduce: } break; - case 213: + case 217: /* Line 1787 of yacc.c */ -#line 1002 "util/configparser.y" +#line 1025 "util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3198,9 +3235,9 @@ yyreduce: } break; - case 214: + case 218: /* Line 1787 of yacc.c */ -#line 1011 "util/configparser.y" +#line 1034 "util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3210,9 +3247,9 @@ yyreduce: } break; - case 215: + case 219: /* Line 1787 of yacc.c */ -#line 1020 "util/configparser.y" +#line 1043 "util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3222,9 +3259,9 @@ yyreduce: } break; - case 216: + case 220: /* Line 1787 of yacc.c */ -#line 1029 "util/configparser.y" +#line 1052 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size)) @@ -3233,9 +3270,9 @@ yyreduce: } break; - case 217: + case 221: /* Line 1787 of yacc.c */ -#line 1037 "util/configparser.y" +#line 1060 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3249,9 +3286,9 @@ yyreduce: } break; - case 218: + case 222: /* Line 1787 of yacc.c */ -#line 1050 "util/configparser.y" +#line 1073 "util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size)) @@ -3260,9 +3297,9 @@ yyreduce: } break; - case 219: + case 223: /* Line 1787 of yacc.c */ -#line 1058 "util/configparser.y" +#line 1081 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && @@ -3285,9 +3322,9 @@ yyreduce: } break; - case 220: + case 224: /* Line 1787 of yacc.c */ -#line 1080 "util/configparser.y" +#line 1103 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str))) @@ -3295,9 +3332,9 @@ yyreduce: } break; - case 221: + case 225: /* Line 1787 of yacc.c */ -#line 1087 "util/configparser.y" +#line 1110 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3313,9 +3350,9 @@ yyreduce: } break; - case 222: + case 226: /* Line 1787 of yacc.c */ -#line 1102 "util/configparser.y" +#line 1125 "util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3326,9 +3363,9 @@ yyreduce: } break; - case 223: + case 227: /* Line 1787 of yacc.c */ -#line 1112 "util/configparser.y" +#line 1135 "util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3339,9 +3376,9 @@ yyreduce: } break; - case 224: + case 228: /* Line 1787 of yacc.c */ -#line 1122 "util/configparser.y" +#line 1145 "util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[(2) - (2)].str)); @@ -3349,9 +3386,9 @@ yyreduce: } break; - case 225: + case 229: /* Line 1787 of yacc.c */ -#line 1129 "util/configparser.y" +#line 1152 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3362,9 +3399,9 @@ yyreduce: } break; - case 226: + case 230: /* Line 1787 of yacc.c */ -#line 1139 "util/configparser.y" +#line 1162 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str))) @@ -3372,9 +3409,9 @@ yyreduce: } break; - case 227: + case 231: /* Line 1787 of yacc.c */ -#line 1146 "util/configparser.y" +#line 1169 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str))) @@ -3382,9 +3419,9 @@ yyreduce: } break; - case 228: + case 232: /* Line 1787 of yacc.c */ -#line 1153 "util/configparser.y" +#line 1176 "util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3394,9 +3431,9 @@ yyreduce: } break; - case 229: + case 233: /* Line 1787 of yacc.c */ -#line 1162 "util/configparser.y" +#line 1185 "util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3407,9 +3444,9 @@ yyreduce: } break; - case 230: + case 234: /* Line 1787 of yacc.c */ -#line 1172 "util/configparser.y" +#line 1195 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3420,9 +3457,9 @@ yyreduce: } break; - case 231: + case 235: /* Line 1787 of yacc.c */ -#line 1182 "util/configparser.y" +#line 1205 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str))) @@ -3430,9 +3467,9 @@ yyreduce: } break; - case 232: + case 236: /* Line 1787 of yacc.c */ -#line 1189 "util/configparser.y" +#line 1212 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str))) @@ -3440,9 +3477,9 @@ yyreduce: } break; - case 233: + case 237: /* Line 1787 of yacc.c */ -#line 1196 "util/configparser.y" +#line 1219 "util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3452,17 +3489,17 @@ yyreduce: } break; - case 234: + case 238: /* Line 1787 of yacc.c */ -#line 1205 "util/configparser.y" +#line 1228 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 244: + case 248: /* Line 1787 of yacc.c */ -#line 1216 "util/configparser.y" +#line 1239 "util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3473,9 +3510,9 @@ yyreduce: } break; - case 245: + case 249: /* Line 1787 of yacc.c */ -#line 1226 "util/configparser.y" +#line 1249 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3485,9 +3522,9 @@ yyreduce: } break; - case 246: + case 250: /* Line 1787 of yacc.c */ -#line 1235 "util/configparser.y" +#line 1258 "util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str))) @@ -3495,9 +3532,9 @@ yyreduce: } break; - case 247: + case 251: /* Line 1787 of yacc.c */ -#line 1242 "util/configparser.y" +#line 1265 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3505,9 +3542,9 @@ yyreduce: } break; - case 248: + case 252: /* Line 1787 of yacc.c */ -#line 1249 "util/configparser.y" +#line 1272 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3515,9 +3552,9 @@ yyreduce: } break; - case 249: + case 253: /* Line 1787 of yacc.c */ -#line 1256 "util/configparser.y" +#line 1279 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3525,9 +3562,9 @@ yyreduce: } break; - case 250: + case 254: /* Line 1787 of yacc.c */ -#line 1263 "util/configparser.y" +#line 1286 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3535,17 +3572,17 @@ yyreduce: } break; - case 251: + case 255: /* Line 1787 of yacc.c */ -#line 1270 "util/configparser.y" +#line 1293 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 255: + case 259: /* Line 1787 of yacc.c */ -#line 1279 "util/configparser.y" +#line 1302 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -3555,7 +3592,7 @@ yyreduce: /* Line 1787 of yacc.c */ -#line 3559 "util/configparser.c" +#line 3596 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3785,7 +3822,7 @@ yyreturn: /* Line 2048 of yacc.c */ -#line 1284 "util/configparser.y" +#line 1307 "util/configparser.y" /* parse helper routines could be here */ |