diff options
Diffstat (limited to 'external/unbound/util/configparser.c')
| -rw-r--r-- | external/unbound/util/configparser.c | 1245 |
1 files changed, 634 insertions, 611 deletions
diff --git a/external/unbound/util/configparser.c b/external/unbound/util/configparser.c index a571f5c7f..50346f6ee 100644 --- a/external/unbound/util/configparser.c +++ b/external/unbound/util/configparser.c @@ -285,7 +285,8 @@ extern int yydebug; VAR_RATELIMIT_FACTOR = 413, VAR_CAPS_WHITELIST = 414, VAR_CACHE_MAX_NEGATIVE_TTL = 415, - VAR_PERMIT_SMALL_HOLDDOWN = 416 + VAR_PERMIT_SMALL_HOLDDOWN = 416, + VAR_QNAME_MINIMISATION = 417 }; #endif /* Tokens. */ @@ -448,6 +449,7 @@ extern int yydebug; #define VAR_CAPS_WHITELIST 414 #define VAR_CACHE_MAX_NEGATIVE_TTL 415 #define VAR_PERMIT_SMALL_HOLDDOWN 416 +#define VAR_QNAME_MINIMISATION 417 @@ -461,7 +463,7 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ -#line 465 "util/configparser.c" +#line 467 "util/configparser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -489,7 +491,7 @@ int yyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 493 "util/configparser.c" +#line 495 "util/configparser.c" #ifdef short # undef short @@ -709,20 +711,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 303 +#define YYLAST 305 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 162 +#define YYNTOKENS 163 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 167 +#define YYNNTS 168 /* YYNRULES -- Number of rules. */ -#define YYNRULES 319 +#define YYNRULES 321 /* YYNRULES -- Number of states. */ -#define YYNSTATES 470 +#define YYNSTATES 473 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 416 +#define YYMAXUTOK 417 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -771,7 +773,7 @@ static const yytype_uint8 yytranslate[] = 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 + 155, 156, 157, 158, 159, 160, 161, 162 }; #if YYDEBUG @@ -792,147 +794,149 @@ static const yytype_uint16 yyprhs[] = 205, 207, 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, 253, 255, 257, 259, 261, 263, - 265, 268, 269, 271, 273, 275, 277, 279, 281, 284, - 285, 287, 289, 291, 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, - 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, 585, 588, 591, 594, 597, 600, 604, 607, 610, - 613, 616, 619, 622, 625, 628, 631, 634, 638, 642, - 645, 648, 651, 654, 657, 660, 663, 666, 669, 672, - 674, 677, 678, 680, 682, 684, 686, 688, 690, 692, - 694, 697, 700, 703, 706, 709, 712, 715, 718, 720, - 723, 724, 726, 728, 730, 732, 734, 736, 738, 740, - 742, 744, 746, 748, 751, 754, 757, 760, 763, 766, - 769, 772, 775, 778, 781, 784, 786, 789, 790, 792 + 265, 267, 270, 271, 273, 275, 277, 279, 281, 283, + 286, 287, 289, 291, 293, 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, 481, 484, 487, + 490, 493, 496, 499, 502, 505, 508, 511, 514, 517, + 520, 523, 526, 529, 532, 535, 538, 542, 545, 548, + 551, 554, 557, 560, 563, 566, 569, 572, 575, 578, + 581, 584, 587, 590, 593, 596, 599, 602, 606, 609, + 612, 615, 618, 621, 624, 627, 630, 633, 636, 640, + 644, 647, 650, 653, 656, 659, 662, 665, 668, 671, + 674, 677, 679, 682, 683, 685, 687, 689, 691, 693, + 695, 697, 699, 702, 705, 708, 711, 714, 717, 720, + 723, 725, 728, 729, 731, 733, 735, 737, 739, 741, + 743, 745, 747, 749, 751, 753, 756, 759, 762, 765, + 768, 771, 774, 777, 780, 783, 786, 789, 791, 794, + 795, 797 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 163, 0, -1, -1, 163, 164, -1, 165, 166, -1, - 168, 169, -1, 171, 172, -1, 325, 326, -1, 299, - 300, -1, 310, 311, -1, 11, -1, 166, 167, -1, - -1, 174, -1, 175, -1, 179, -1, 182, -1, 188, - -1, 189, -1, 190, -1, 191, -1, 180, -1, 201, - -1, 202, -1, 203, -1, 204, -1, 205, -1, 224, - -1, 225, -1, 226, -1, 230, -1, 231, -1, 185, - -1, 232, -1, 233, -1, 236, -1, 234, -1, 235, - -1, 238, -1, 239, -1, 240, -1, 253, -1, 214, - -1, 215, -1, 216, -1, 217, -1, 241, -1, 256, - -1, 210, -1, 212, -1, 257, -1, 263, -1, 264, - -1, 265, -1, 186, -1, 223, -1, 273, -1, 274, - -1, 211, -1, 268, -1, 198, -1, 181, -1, 206, - -1, 254, -1, 260, -1, 242, -1, 255, -1, 276, - -1, 277, -1, 187, -1, 176, -1, 197, -1, 246, - -1, 177, -1, 183, -1, 184, -1, 207, -1, 208, - -1, 275, -1, 244, -1, 248, -1, 249, -1, 178, - -1, 278, -1, 227, -1, 252, -1, 199, -1, 213, - -1, 258, -1, 259, -1, 262, -1, 267, -1, 209, - -1, 269, -1, 270, -1, 271, -1, 218, -1, 222, - -1, 250, -1, 251, -1, 219, -1, 243, -1, 266, - -1, 200, -1, 192, -1, 193, -1, 194, -1, 195, - -1, 196, -1, 279, -1, 280, -1, 281, -1, 220, - -1, 228, -1, 229, -1, 282, -1, 283, -1, 237, - -1, 245, -1, 221, -1, 284, -1, 286, -1, 285, - -1, 287, -1, 288, -1, 289, -1, 247, -1, 261, - -1, 272, -1, 38, -1, 169, 170, -1, -1, 290, - -1, 291, -1, 292, -1, 294, -1, 293, -1, 44, - -1, 172, 173, -1, -1, 295, -1, 296, -1, 297, - -1, 298, -1, 13, 10, -1, 12, 10, -1, 76, - 10, -1, 79, 10, -1, 97, 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, 123, 10, -1, - 124, 10, -1, 125, 10, -1, 126, 10, -1, 127, - 10, -1, 77, 10, -1, 66, 10, -1, 102, 10, - -1, 122, 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, 110, 10, - -1, 54, 10, -1, 64, 10, -1, 55, 10, -1, - 103, 10, -1, 48, 10, -1, 49, 10, -1, 50, - 10, -1, 51, 10, -1, 114, 10, -1, 118, 10, - -1, 119, 10, -1, 152, 10, -1, 115, 10, -1, - 61, 10, -1, 26, 10, -1, 27, 10, -1, 28, - 10, -1, 99, 10, -1, 133, 10, -1, 134, 10, - -1, 29, 10, -1, 30, 10, -1, 32, 10, -1, - 33, 10, -1, 35, 10, -1, 36, 10, -1, 34, - 10, -1, 135, 10, -1, 41, 10, -1, 42, 10, - -1, 43, 10, -1, 52, 10, -1, 71, 10, -1, - 120, 10, -1, 85, 10, -1, 151, 10, -1, 78, - 10, -1, 159, 10, -1, 86, 10, -1, 87, 10, - -1, 116, 10, -1, 117, 10, -1, 101, 10, -1, - 47, 10, -1, 69, 10, -1, 72, 10, 10, -1, - 53, 10, -1, 56, 10, -1, 106, 10, -1, 107, - 10, -1, 70, 10, -1, 160, 10, -1, 108, 10, - -1, 57, 10, -1, 58, 10, -1, 59, 10, -1, - 121, 10, -1, 109, 10, -1, 65, 10, -1, 112, - 10, -1, 113, 10, -1, 111, 10, -1, 161, 10, - -1, 62, 10, -1, 63, 10, -1, 84, 10, -1, - 73, 10, 10, -1, 74, 10, -1, 98, 10, -1, - 130, 10, -1, 131, 10, -1, 132, 10, -1, 136, - 10, -1, 137, 10, -1, 153, 10, -1, 155, 10, - -1, 154, 10, -1, 156, 10, 10, -1, 157, 10, - 10, -1, 158, 10, -1, 37, 10, -1, 39, 10, - -1, 40, 10, -1, 129, 10, -1, 100, 10, -1, - 37, 10, -1, 45, 10, -1, 46, 10, -1, 128, - 10, -1, 88, -1, 300, 301, -1, -1, 302, -1, - 304, -1, 303, -1, 306, -1, 307, -1, 308, -1, - 309, -1, 305, -1, 89, 10, -1, 91, 10, -1, - 90, 10, -1, 96, 10, -1, 92, 10, -1, 93, - 10, -1, 94, 10, -1, 95, 10, -1, 138, -1, - 311, 312, -1, -1, 313, -1, 314, -1, 315, -1, - 316, -1, 317, -1, 318, -1, 319, -1, 320, -1, - 321, -1, 322, -1, 323, -1, 324, -1, 139, 10, - -1, 140, 10, -1, 141, 10, -1, 142, 10, -1, - 143, 10, -1, 144, 10, -1, 145, 10, -1, 146, - 10, -1, 147, 10, -1, 148, 10, -1, 149, 10, - -1, 150, 10, -1, 104, -1, 326, 327, -1, -1, - 328, -1, 105, 10, -1 + 164, 0, -1, -1, 164, 165, -1, 166, 167, -1, + 169, 170, -1, 172, 173, -1, 327, 328, -1, 301, + 302, -1, 312, 313, -1, 11, -1, 167, 168, -1, + -1, 175, -1, 176, -1, 180, -1, 183, -1, 189, + -1, 190, -1, 191, -1, 192, -1, 181, -1, 202, + -1, 203, -1, 204, -1, 205, -1, 206, -1, 225, + -1, 226, -1, 227, -1, 231, -1, 232, -1, 186, + -1, 233, -1, 234, -1, 237, -1, 235, -1, 236, + -1, 239, -1, 240, -1, 241, -1, 254, -1, 215, + -1, 216, -1, 217, -1, 218, -1, 242, -1, 257, + -1, 211, -1, 213, -1, 258, -1, 264, -1, 265, + -1, 266, -1, 187, -1, 224, -1, 274, -1, 275, + -1, 212, -1, 269, -1, 199, -1, 182, -1, 207, + -1, 255, -1, 261, -1, 243, -1, 256, -1, 277, + -1, 278, -1, 188, -1, 177, -1, 198, -1, 247, + -1, 178, -1, 184, -1, 185, -1, 208, -1, 209, + -1, 276, -1, 245, -1, 249, -1, 250, -1, 179, + -1, 279, -1, 228, -1, 253, -1, 200, -1, 214, + -1, 259, -1, 260, -1, 263, -1, 268, -1, 210, + -1, 270, -1, 271, -1, 272, -1, 219, -1, 223, + -1, 251, -1, 252, -1, 220, -1, 244, -1, 267, + -1, 201, -1, 193, -1, 194, -1, 195, -1, 196, + -1, 197, -1, 280, -1, 281, -1, 282, -1, 221, + -1, 229, -1, 230, -1, 283, -1, 284, -1, 238, + -1, 246, -1, 222, -1, 285, -1, 287, -1, 286, + -1, 288, -1, 289, -1, 290, -1, 248, -1, 262, + -1, 273, -1, 291, -1, 38, -1, 170, 171, -1, + -1, 292, -1, 293, -1, 294, -1, 296, -1, 295, + -1, 44, -1, 173, 174, -1, -1, 297, -1, 298, + -1, 299, -1, 300, -1, 13, 10, -1, 12, 10, + -1, 76, 10, -1, 79, 10, -1, 97, 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, 123, + 10, -1, 124, 10, -1, 125, 10, -1, 126, 10, + -1, 127, 10, -1, 77, 10, -1, 66, 10, -1, + 102, 10, -1, 122, 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, + 110, 10, -1, 54, 10, -1, 64, 10, -1, 55, + 10, -1, 103, 10, -1, 48, 10, -1, 49, 10, + -1, 50, 10, -1, 51, 10, -1, 114, 10, -1, + 118, 10, -1, 119, 10, -1, 152, 10, -1, 115, + 10, -1, 61, 10, -1, 26, 10, -1, 27, 10, + -1, 28, 10, -1, 99, 10, -1, 133, 10, -1, + 134, 10, -1, 29, 10, -1, 30, 10, -1, 32, + 10, -1, 33, 10, -1, 35, 10, -1, 36, 10, + -1, 34, 10, -1, 135, 10, -1, 41, 10, -1, + 42, 10, -1, 43, 10, -1, 52, 10, -1, 71, + 10, -1, 120, 10, -1, 85, 10, -1, 151, 10, + -1, 78, 10, -1, 159, 10, -1, 86, 10, -1, + 87, 10, -1, 116, 10, -1, 117, 10, -1, 101, + 10, -1, 47, 10, -1, 69, 10, -1, 72, 10, + 10, -1, 53, 10, -1, 56, 10, -1, 106, 10, + -1, 107, 10, -1, 70, 10, -1, 160, 10, -1, + 108, 10, -1, 57, 10, -1, 58, 10, -1, 59, + 10, -1, 121, 10, -1, 109, 10, -1, 65, 10, + -1, 112, 10, -1, 113, 10, -1, 111, 10, -1, + 161, 10, -1, 62, 10, -1, 63, 10, -1, 84, + 10, -1, 73, 10, 10, -1, 74, 10, -1, 98, + 10, -1, 130, 10, -1, 131, 10, -1, 132, 10, + -1, 136, 10, -1, 137, 10, -1, 153, 10, -1, + 155, 10, -1, 154, 10, -1, 156, 10, 10, -1, + 157, 10, 10, -1, 158, 10, -1, 162, 10, -1, + 37, 10, -1, 39, 10, -1, 40, 10, -1, 129, + 10, -1, 100, 10, -1, 37, 10, -1, 45, 10, + -1, 46, 10, -1, 128, 10, -1, 88, -1, 302, + 303, -1, -1, 304, -1, 306, -1, 305, -1, 308, + -1, 309, -1, 310, -1, 311, -1, 307, -1, 89, + 10, -1, 91, 10, -1, 90, 10, -1, 96, 10, + -1, 92, 10, -1, 93, 10, -1, 94, 10, -1, + 95, 10, -1, 138, -1, 313, 314, -1, -1, 315, + -1, 316, -1, 317, -1, 318, -1, 319, -1, 320, + -1, 321, -1, 322, -1, 323, -1, 324, -1, 325, + -1, 326, -1, 139, 10, -1, 140, 10, -1, 141, + 10, -1, 142, 10, -1, 143, 10, -1, 144, 10, + -1, 145, 10, -1, 146, 10, -1, 147, 10, -1, + 148, 10, -1, 149, 10, -1, 150, 10, -1, 104, + -1, 328, 329, -1, -1, 330, -1, 105, 10, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 127, 127, 127, 128, 128, 129, 129, 130, 130, - 134, 139, 140, 141, 141, 141, 142, 142, 143, 143, - 143, 144, 144, 144, 145, 145, 145, 146, 146, 147, - 147, 148, 148, 149, 149, 150, 150, 151, 151, 152, - 152, 153, 153, 154, 154, 154, 155, 155, 155, 156, - 156, 156, 157, 157, 158, 158, 159, 159, 160, 160, - 161, 161, 161, 162, 162, 163, 163, 164, 164, 164, - 165, 165, 166, 166, 167, 167, 168, 168, 168, 169, - 169, 170, 170, 171, 171, 172, 172, 173, 173, 174, - 174, 174, 175, 175, 176, 176, 176, 177, 177, 177, - 178, 178, 178, 179, 179, 179, 180, 180, 180, 181, - 181, 181, 182, 182, 182, 183, 183, 184, 184, 185, - 185, 185, 186, 186, 187, 187, 188, 188, 189, 191, - 203, 204, 205, 205, 205, 205, 205, 207, 219, 220, - 221, 221, 221, 221, 223, 232, 241, 252, 261, 270, - 279, 292, 307, 316, 325, 334, 343, 352, 361, 370, - 379, 388, 397, 406, 415, 422, 429, 438, 447, 461, - 470, 479, 486, 493, 500, 508, 515, 522, 529, 536, - 544, 552, 560, 567, 574, 583, 592, 599, 606, 614, - 622, 632, 642, 655, 666, 674, 687, 696, 705, 714, - 724, 732, 745, 754, 762, 771, 779, 792, 801, 808, - 818, 828, 838, 848, 858, 868, 878, 888, 895, 902, - 909, 918, 927, 936, 943, 953, 970, 977, 995, 1008, - 1021, 1030, 1039, 1048, 1057, 1067, 1077, 1086, 1095, 1102, - 1111, 1120, 1129, 1138, 1146, 1159, 1167, 1191, 1198, 1213, - 1223, 1233, 1240, 1247, 1256, 1265, 1273, 1286, 1299, 1312, - 1321, 1331, 1338, 1345, 1354, 1364, 1374, 1381, 1388, 1397, - 1402, 1403, 1404, 1404, 1404, 1405, 1405, 1405, 1406, 1406, - 1408, 1418, 1427, 1434, 1444, 1451, 1458, 1465, 1472, 1477, - 1478, 1479, 1479, 1480, 1480, 1481, 1481, 1482, 1483, 1484, - 1485, 1486, 1487, 1489, 1497, 1504, 1512, 1520, 1527, 1534, - 1543, 1552, 1561, 1570, 1579, 1588, 1593, 1594, 1595, 1597 + 0, 128, 128, 128, 129, 129, 130, 130, 131, 131, + 135, 140, 141, 142, 142, 142, 143, 143, 144, 144, + 144, 145, 145, 145, 146, 146, 146, 147, 147, 148, + 148, 149, 149, 150, 150, 151, 151, 152, 152, 153, + 153, 154, 154, 155, 155, 155, 156, 156, 156, 157, + 157, 157, 158, 158, 159, 159, 160, 160, 161, 161, + 162, 162, 162, 163, 163, 164, 164, 165, 165, 165, + 166, 166, 167, 167, 168, 168, 169, 169, 169, 170, + 170, 171, 171, 172, 172, 173, 173, 174, 174, 175, + 175, 175, 176, 176, 177, 177, 177, 178, 178, 178, + 179, 179, 179, 180, 180, 180, 181, 181, 181, 182, + 182, 182, 183, 183, 183, 184, 184, 185, 185, 186, + 186, 186, 187, 187, 188, 188, 189, 189, 190, 190, + 192, 204, 205, 206, 206, 206, 206, 206, 208, 220, + 221, 222, 222, 222, 222, 224, 233, 242, 253, 262, + 271, 280, 293, 308, 317, 326, 335, 344, 353, 362, + 371, 380, 389, 398, 407, 416, 423, 430, 439, 448, + 462, 471, 480, 487, 494, 501, 509, 516, 523, 530, + 537, 545, 553, 561, 568, 575, 584, 593, 600, 607, + 615, 623, 633, 643, 656, 667, 675, 688, 697, 706, + 715, 725, 733, 746, 755, 763, 772, 780, 793, 802, + 809, 819, 829, 839, 849, 859, 869, 879, 889, 896, + 903, 910, 919, 928, 937, 944, 954, 971, 978, 996, + 1009, 1022, 1031, 1040, 1049, 1058, 1068, 1078, 1087, 1096, + 1103, 1112, 1121, 1130, 1139, 1147, 1160, 1168, 1192, 1199, + 1214, 1224, 1234, 1241, 1248, 1257, 1266, 1274, 1287, 1300, + 1313, 1322, 1332, 1342, 1349, 1356, 1365, 1375, 1385, 1392, + 1399, 1408, 1413, 1414, 1415, 1415, 1415, 1416, 1416, 1416, + 1417, 1417, 1419, 1429, 1438, 1445, 1455, 1462, 1469, 1476, + 1483, 1488, 1489, 1490, 1490, 1491, 1491, 1492, 1492, 1493, + 1494, 1495, 1496, 1497, 1498, 1500, 1508, 1515, 1523, 1531, + 1538, 1545, 1554, 1563, 1572, 1581, 1590, 1599, 1604, 1605, + 1606, 1608 }; #endif @@ -998,17 +1002,17 @@ static const char *const yytname[] = "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", "$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_PERMIT_SMALL_HOLDDOWN", "VAR_QNAME_MINIMISATION", "$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", @@ -1050,15 +1054,16 @@ static const char *const yytname[] = "server_rrset_roundrobin", "server_max_udp_size", "server_dns64_prefix", "server_dns64_synthall", "server_ratelimit", "server_ratelimit_size", "server_ratelimit_slabs", "server_ratelimit_for_domain", - "server_ratelimit_below_domain", "server_ratelimit_factor", "stub_name", - "stub_host", "stub_addr", "stub_first", "stub_prime", "forward_name", - "forward_host", "forward_addr", "forward_first", "rcstart", - "contents_rc", "content_rc", "rc_control_enable", "rc_control_port", - "rc_control_interface", "rc_control_use_cert", "rc_server_key_file", - "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file", - "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable", - "dt_dnstap_socket_path", "dt_dnstap_send_identity", - "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version", + "server_ratelimit_below_domain", "server_ratelimit_factor", + "server_qname_minimisation", "stub_name", "stub_host", "stub_addr", + "stub_first", "stub_prime", "forward_name", "forward_host", + "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc", + "rc_control_enable", "rc_control_port", "rc_control_interface", + "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file", + "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt", + "content_dt", "dt_dnstap_enable", "dt_dnstap_socket_path", + "dt_dnstap_send_identity", "dt_dnstap_send_version", + "dt_dnstap_identity", "dt_dnstap_version", "dt_dnstap_log_resolver_query_messages", "dt_dnstap_log_resolver_response_messages", "dt_dnstap_log_client_query_messages", @@ -1090,28 +1095,28 @@ static const yytype_uint16 yytoknum[] = 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416 + 415, 416, 417 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 162, 163, 163, 164, 164, 164, 164, 164, 164, - 165, 166, 166, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 168, - 169, 169, 170, 170, 170, 170, 170, 171, 172, 172, - 173, 173, 173, 173, 174, 175, 176, 177, 178, 179, + 0, 163, 164, 164, 165, 165, 165, 165, 165, 165, + 166, 167, 167, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 169, 170, 170, 171, 171, 171, 171, 171, 172, 173, + 173, 174, 174, 174, 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, @@ -1124,11 +1129,12 @@ static const yytype_uint16 yyr1[] = 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, 300, 301, 301, 301, 301, 301, 301, 301, 301, - 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 311, 312, 312, 312, 312, 312, 312, 312, 312, 312, - 312, 312, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 326, 327, 328 + 300, 301, 302, 302, 303, 303, 303, 303, 303, 303, + 303, 303, 304, 305, 306, 307, 308, 309, 310, 311, + 312, 313, 313, 314, 314, 314, 314, 314, 314, 314, + 314, 314, 314, 314, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 328, + 329, 330 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1147,8 +1153,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, - 2, 0, 1, 1, 1, 1, 1, 1, 2, 0, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 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, 2, 2, 2, @@ -1156,16 +1162,17 @@ 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, 3, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 1, 2, 0, 1, 2 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, + 1, 2 }; /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. @@ -1173,8 +1180,8 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 10, 129, 137, 269, 315, 288, 3, - 12, 131, 139, 271, 290, 317, 4, 5, 6, 8, + 2, 0, 1, 10, 130, 138, 271, 317, 290, 3, + 12, 132, 140, 273, 292, 319, 4, 5, 6, 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, 0, 0, 0, @@ -1186,62 +1193,63 @@ 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, 11, 13, - 14, 70, 73, 82, 15, 21, 61, 16, 74, 75, - 32, 54, 69, 17, 18, 19, 20, 104, 105, 106, - 107, 108, 71, 60, 86, 103, 22, 23, 24, 25, - 26, 62, 76, 77, 92, 48, 58, 49, 87, 42, - 43, 44, 45, 96, 100, 112, 119, 97, 55, 27, - 28, 29, 84, 113, 114, 30, 31, 33, 34, 36, - 37, 35, 117, 38, 39, 40, 46, 65, 101, 79, - 118, 72, 126, 80, 81, 98, 99, 85, 41, 63, - 66, 47, 50, 88, 89, 64, 127, 90, 51, 52, - 53, 102, 91, 59, 93, 94, 95, 128, 56, 57, - 78, 67, 68, 83, 109, 110, 111, 115, 116, 120, - 122, 121, 123, 124, 125, 0, 0, 0, 0, 0, - 130, 132, 133, 134, 136, 135, 0, 0, 0, 0, - 138, 140, 141, 142, 143, 0, 0, 0, 0, 0, - 0, 0, 0, 270, 272, 274, 273, 279, 275, 276, - 277, 278, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 289, 291, 292, 293, 294, 295, - 296, 297, 298, 299, 300, 301, 302, 0, 316, 318, - 145, 144, 149, 152, 150, 158, 159, 160, 161, 171, - 172, 173, 174, 175, 194, 195, 196, 200, 201, 155, - 202, 203, 206, 204, 205, 208, 209, 210, 223, 184, - 185, 186, 187, 211, 226, 180, 182, 227, 233, 234, - 235, 156, 193, 243, 244, 181, 238, 168, 151, 176, - 224, 230, 212, 0, 0, 247, 157, 146, 167, 216, - 147, 153, 154, 177, 178, 245, 214, 218, 219, 148, - 248, 197, 222, 169, 183, 228, 229, 232, 237, 179, - 241, 239, 240, 188, 192, 220, 221, 189, 190, 213, - 236, 170, 162, 163, 164, 165, 166, 249, 250, 251, - 198, 199, 207, 252, 253, 215, 191, 254, 256, 255, - 0, 0, 259, 217, 231, 242, 260, 261, 262, 264, - 263, 265, 266, 267, 268, 280, 282, 281, 284, 285, - 286, 287, 283, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 319, 225, 246, 257, 258 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, + 13, 14, 70, 73, 82, 15, 21, 61, 16, 74, + 75, 32, 54, 69, 17, 18, 19, 20, 104, 105, + 106, 107, 108, 71, 60, 86, 103, 22, 23, 24, + 25, 26, 62, 76, 77, 92, 48, 58, 49, 87, + 42, 43, 44, 45, 96, 100, 112, 119, 97, 55, + 27, 28, 29, 84, 113, 114, 30, 31, 33, 34, + 36, 37, 35, 117, 38, 39, 40, 46, 65, 101, + 79, 118, 72, 126, 80, 81, 98, 99, 85, 41, + 63, 66, 47, 50, 88, 89, 64, 127, 90, 51, + 52, 53, 102, 91, 59, 93, 94, 95, 128, 56, + 57, 78, 67, 68, 83, 109, 110, 111, 115, 116, + 120, 122, 121, 123, 124, 125, 129, 0, 0, 0, + 0, 0, 131, 133, 134, 135, 137, 136, 0, 0, + 0, 0, 139, 141, 142, 143, 144, 0, 0, 0, + 0, 0, 0, 0, 0, 272, 274, 276, 275, 281, + 277, 278, 279, 280, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 291, 293, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 303, 304, 0, + 318, 320, 146, 145, 150, 153, 151, 159, 160, 161, + 162, 172, 173, 174, 175, 176, 195, 196, 197, 201, + 202, 156, 203, 204, 207, 205, 206, 209, 210, 211, + 224, 185, 186, 187, 188, 212, 227, 181, 183, 228, + 234, 235, 236, 157, 194, 244, 245, 182, 239, 169, + 152, 177, 225, 231, 213, 0, 0, 248, 158, 147, + 168, 217, 148, 154, 155, 178, 179, 246, 215, 219, + 220, 149, 249, 198, 223, 170, 184, 229, 230, 233, + 238, 180, 242, 240, 241, 189, 193, 221, 222, 190, + 191, 214, 237, 171, 163, 164, 165, 166, 167, 250, + 251, 252, 199, 200, 208, 253, 254, 216, 192, 255, + 257, 256, 0, 0, 260, 218, 232, 243, 261, 262, + 263, 264, 266, 265, 267, 268, 269, 270, 282, 284, + 283, 286, 287, 288, 289, 285, 305, 306, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 321, 226, + 247, 258, 259 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 9, 10, 16, 138, 11, 17, 260, 12, - 18, 270, 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, 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, 261, 262, - 263, 264, 265, 271, 272, 273, 274, 13, 19, 283, - 284, 285, 286, 287, 288, 289, 290, 291, 14, 20, - 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 15, 21, 318, 319 + -1, 1, 9, 10, 16, 139, 11, 17, 262, 12, + 18, 272, 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, 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, 263, + 264, 265, 266, 267, 273, 274, 275, 276, 13, 19, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 14, + 20, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 15, 21, 320, 321 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1252,17 +1260,18 @@ static const yytype_int16 yypact[] = -81, 116, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -12, 89, 47, -13, 22, -80, 16, 17, 18, 23, 24, 78, 107, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 140, 141, - 142, 143, 145, 146, 147, 148, 149, 163, 164, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 195, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 207, 209, - 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, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 258, 259, -81, -81, + 121, 122, 123, 124, 125, 126, 127, 128, 141, 142, + 143, 145, 146, 147, 148, 149, 163, 164, 166, 167, + 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, + 178, 180, 181, 182, 183, 184, 185, 186, 187, 188, + 189, 190, 191, 192, 193, 195, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 206, 207, 209, 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, 245, 246, 247, 248, 249, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, -81, + -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, @@ -1273,29 +1282,29 @@ static const yytype_int16 yypact[] = -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81, -81, -81, -81, -81, -81, -81, 262, 263, 264, + 265, 266, -81, -81, -81, -81, -81, -81, 267, 268, + 269, 270, -81, -81, -81, -81, -81, 271, 272, 273, + 274, 275, 276, 277, 278, -81, -81, -81, -81, -81, + -81, -81, -81, -81, 279, 280, 281, 282, 283, 284, + 285, 286, 287, 288, 289, 290, -81, -81, -81, -81, + -81, -81, -81, -81, -81, -81, -81, -81, -81, 291, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, 260, 261, 262, 263, 264, - -81, -81, -81, -81, -81, -81, 265, 266, 267, 268, - -81, -81, -81, -81, -81, 269, 270, 271, 272, 273, - 274, 275, 276, -81, -81, -81, -81, -81, -81, -81, - -81, -81, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, 289, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81, -81, -81, -81, -81, 292, 293, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, 290, 291, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, + -81, -81, 294, 295, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - 292, 293, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, -81, -81, -81 + -81, -81, -81 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1317,7 +1326,7 @@ static const yytype_int8 yypgoto[] = -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81 + -81, -81, -81, -81, -81, -81, -81, -81 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1328,35 +1337,35 @@ static const yytype_uint16 yytable[] = { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 317, 320, 321, 322, 47, - 48, 49, 0, 323, 324, 50, 51, 52, 53, 54, + 42, 43, 44, 45, 46, 319, 322, 323, 324, 47, + 48, 49, 0, 325, 326, 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, 275, 276, 277, 278, - 279, 280, 281, 282, 266, 91, 92, 93, 325, 94, - 95, 96, 267, 268, 97, 98, 99, 100, 101, 102, + 85, 86, 87, 88, 89, 90, 277, 278, 279, 280, + 281, 282, 283, 284, 268, 91, 92, 93, 327, 94, + 95, 96, 269, 270, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 2, 326, 119, 120, - 121, 122, 123, 124, 125, 126, 255, 3, 256, 257, - 327, 328, 329, 330, 331, 332, 333, 334, 335, 127, + 113, 114, 115, 116, 117, 118, 2, 328, 119, 120, + 121, 122, 123, 124, 125, 126, 257, 3, 258, 259, + 329, 330, 331, 332, 333, 334, 335, 336, 337, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 336, 337, 338, 339, 4, 340, 341, 342, 343, 344, - 5, 292, 293, 294, 295, 296, 297, 298, 299, 300, - 301, 302, 303, 345, 346, 269, 347, 348, 349, 350, - 351, 352, 353, 354, 355, 356, 357, 358, 359, 258, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, - 370, 371, 372, 373, 6, 374, 375, 376, 377, 378, - 379, 380, 381, 382, 383, 384, 385, 386, 259, 387, - 7, 388, 389, 390, 391, 392, 393, 394, 395, 396, - 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, - 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, - 417, 418, 419, 420, 8, 421, 422, 423, 424, 425, - 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, - 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, - 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, - 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, - 466, 467, 468, 469 + 138, 338, 339, 340, 4, 341, 342, 343, 344, 345, + 5, 294, 295, 296, 297, 298, 299, 300, 301, 302, + 303, 304, 305, 346, 347, 271, 348, 349, 350, 351, + 352, 353, 354, 355, 356, 357, 358, 359, 360, 260, + 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, + 371, 372, 373, 374, 6, 375, 376, 377, 378, 379, + 380, 381, 382, 383, 384, 385, 386, 387, 261, 388, + 7, 389, 390, 391, 392, 393, 394, 395, 396, 397, + 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 419, 420, 421, 8, 422, 423, 424, 425, 426, + 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, + 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, + 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, + 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, + 467, 468, 469, 470, 471, 472 }; #define yypact_value_is_default(Yystate) \ @@ -1382,7 +1391,7 @@ static const yytype_int16 yycheck[] = 132, 133, 134, 135, 136, 137, 37, 11, 39, 40, 10, 10, 10, 10, 10, 10, 10, 10, 10, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 10, 10, 10, 10, 38, 10, 10, 10, 10, 10, + 162, 10, 10, 10, 38, 10, 10, 10, 10, 10, 44, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 10, 10, 128, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 100, @@ -1397,16 +1406,16 @@ static const yytype_int16 yycheck[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 163, 0, 11, 38, 44, 88, 104, 138, 164, - 165, 168, 171, 299, 310, 325, 166, 169, 172, 300, - 311, 326, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 164, 0, 11, 38, 44, 88, 104, 138, 165, + 166, 169, 172, 301, 312, 327, 167, 170, 173, 302, + 313, 328, 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, 50, 51, 52, 53, 54, 55, 56, @@ -1417,7 +1426,7 @@ static const yytype_uint16 yystos[] = 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 130, 131, 132, 133, 134, 135, 136, 137, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 167, 174, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 168, 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, @@ -1429,13 +1438,14 @@ static const yytype_uint16 yystos[] = 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, 37, 39, 40, 100, 129, - 170, 290, 291, 292, 293, 294, 37, 45, 46, 128, - 173, 295, 296, 297, 298, 89, 90, 91, 92, 93, - 94, 95, 96, 301, 302, 303, 304, 305, 306, 307, - 308, 309, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 312, 313, 314, 315, 316, 317, - 318, 319, 320, 321, 322, 323, 324, 105, 327, 328, + 285, 286, 287, 288, 289, 290, 291, 37, 39, 40, + 100, 129, 171, 292, 293, 294, 295, 296, 37, 45, + 46, 128, 174, 297, 298, 299, 300, 89, 90, 91, + 92, 93, 94, 95, 96, 303, 304, 305, 306, 307, + 308, 309, 310, 311, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 314, 315, 316, 317, + 318, 319, 320, 321, 322, 323, 324, 325, 326, 105, + 329, 330, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -1450,7 +1460,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 }; #define yyerrok (yyerrstatus = 0) @@ -2252,15 +2262,15 @@ yyreduce: { case 10: /* Line 1792 of yacc.c */ -#line 135 "./util/configparser.y" +#line 136 "./util/configparser.y" { OUTYY(("\nP(server:)\n")); } break; - case 129: + case 130: /* Line 1792 of yacc.c */ -#line 192 "./util/configparser.y" +#line 193 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2273,9 +2283,9 @@ yyreduce: } break; - case 137: + case 138: /* Line 1792 of yacc.c */ -#line 208 "./util/configparser.y" +#line 209 "./util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2288,9 +2298,9 @@ yyreduce: } break; - case 144: + case 145: /* Line 1792 of yacc.c */ -#line 224 "./util/configparser.y" +#line 225 "./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) @@ -2300,9 +2310,9 @@ yyreduce: } break; - case 145: + case 146: /* Line 1792 of yacc.c */ -#line 233 "./util/configparser.y" +#line 234 "./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) @@ -2312,9 +2322,9 @@ yyreduce: } break; - case 146: + case 147: /* Line 1792 of yacc.c */ -#line 242 "./util/configparser.y" +#line 243 "./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) @@ -2326,9 +2336,9 @@ yyreduce: } break; - case 147: + case 148: /* Line 1792 of yacc.c */ -#line 253 "./util/configparser.y" +#line 254 "./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) @@ -2338,9 +2348,9 @@ yyreduce: } break; - case 148: + case 149: /* Line 1792 of yacc.c */ -#line 262 "./util/configparser.y" +#line 263 "./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) @@ -2350,9 +2360,9 @@ yyreduce: } break; - case 149: + case 150: /* Line 1792 of yacc.c */ -#line 271 "./util/configparser.y" +#line 272 "./util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2362,9 +2372,9 @@ yyreduce: } break; - case 150: + case 151: /* Line 1792 of yacc.c */ -#line 280 "./util/configparser.y" +#line 281 "./util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2378,9 +2388,9 @@ yyreduce: } break; - case 151: + case 152: /* Line 1792 of yacc.c */ -#line 293 "./util/configparser.y" +#line 294 "./util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2396,9 +2406,9 @@ yyreduce: } break; - case 152: + case 153: /* Line 1792 of yacc.c */ -#line 308 "./util/configparser.y" +#line 309 "./util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2408,9 +2418,9 @@ yyreduce: } break; - case 153: + case 154: /* Line 1792 of yacc.c */ -#line 317 "./util/configparser.y" +#line 318 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, @@ -2420,9 +2430,9 @@ yyreduce: } break; - case 154: + case 155: /* Line 1792 of yacc.c */ -#line 326 "./util/configparser.y" +#line 327 "./util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, @@ -2432,9 +2442,9 @@ yyreduce: } break; - case 155: + case 156: /* Line 1792 of yacc.c */ -#line 335 "./util/configparser.y" +#line 336 "./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) @@ -2444,9 +2454,9 @@ yyreduce: } break; - case 156: + case 157: /* Line 1792 of yacc.c */ -#line 344 "./util/configparser.y" +#line 345 "./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) @@ -2456,9 +2466,9 @@ yyreduce: } break; - case 157: + case 158: /* Line 1792 of yacc.c */ -#line 353 "./util/configparser.y" +#line 354 "./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) @@ -2468,9 +2478,9 @@ yyreduce: } break; - case 158: + case 159: /* Line 1792 of yacc.c */ -#line 362 "./util/configparser.y" +#line 363 "./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) @@ -2480,9 +2490,9 @@ yyreduce: } break; - case 159: + case 160: /* Line 1792 of yacc.c */ -#line 371 "./util/configparser.y" +#line 372 "./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) @@ -2492,9 +2502,9 @@ yyreduce: } break; - case 160: + case 161: /* Line 1792 of yacc.c */ -#line 380 "./util/configparser.y" +#line 381 "./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) @@ -2504,9 +2514,9 @@ yyreduce: } break; - case 161: + case 162: /* Line 1792 of yacc.c */ -#line 389 "./util/configparser.y" +#line 390 "./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) @@ -2516,9 +2526,9 @@ yyreduce: } break; - case 162: + case 163: /* Line 1792 of yacc.c */ -#line 398 "./util/configparser.y" +#line 399 "./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) @@ -2528,9 +2538,9 @@ yyreduce: } break; - case 163: + case 164: /* Line 1792 of yacc.c */ -#line 407 "./util/configparser.y" +#line 408 "./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) @@ -2540,9 +2550,9 @@ yyreduce: } break; - case 164: + case 165: /* Line 1792 of yacc.c */ -#line 416 "./util/configparser.y" +#line 417 "./util/configparser.y" { OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_key); @@ -2550,9 +2560,9 @@ yyreduce: } break; - case 165: + case 166: /* Line 1792 of yacc.c */ -#line 423 "./util/configparser.y" +#line 424 "./util/configparser.y" { OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->ssl_service_pem); @@ -2560,9 +2570,9 @@ yyreduce: } break; - case 166: + case 167: /* Line 1792 of yacc.c */ -#line 430 "./util/configparser.y" +#line 431 "./util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2572,9 +2582,9 @@ yyreduce: } break; - case 167: + case 168: /* Line 1792 of yacc.c */ -#line 439 "./util/configparser.y" +#line 440 "./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) @@ -2584,9 +2594,9 @@ yyreduce: } break; - case 168: + case 169: /* Line 1792 of yacc.c */ -#line 448 "./util/configparser.y" +#line 449 "./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) @@ -2601,9 +2611,9 @@ yyreduce: } break; - case 169: + case 170: /* Line 1792 of yacc.c */ -#line 462 "./util/configparser.y" +#line 463 "./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) @@ -2613,9 +2623,9 @@ yyreduce: } break; - case 170: + case 171: /* Line 1792 of yacc.c */ -#line 471 "./util/configparser.y" +#line 472 "./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) @@ -2625,9 +2635,9 @@ yyreduce: } break; - case 171: + case 172: /* Line 1792 of yacc.c */ -#line 480 "./util/configparser.y" +#line 481 "./util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->chrootdir); @@ -2635,9 +2645,9 @@ yyreduce: } break; - case 172: + case 173: /* Line 1792 of yacc.c */ -#line 487 "./util/configparser.y" +#line 488 "./util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->username); @@ -2645,9 +2655,9 @@ yyreduce: } break; - case 173: + case 174: /* Line 1792 of yacc.c */ -#line 494 "./util/configparser.y" +#line 495 "./util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->directory); @@ -2655,9 +2665,9 @@ yyreduce: } break; - case 174: + case 175: /* Line 1792 of yacc.c */ -#line 501 "./util/configparser.y" +#line 502 "./util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->logfile); @@ -2666,9 +2676,9 @@ yyreduce: } break; - case 175: + case 176: /* Line 1792 of yacc.c */ -#line 509 "./util/configparser.y" +#line 510 "./util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->pidfile); @@ -2676,9 +2686,9 @@ yyreduce: } break; - case 176: + case 177: /* Line 1792 of yacc.c */ -#line 516 "./util/configparser.y" +#line 517 "./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))) @@ -2686,9 +2696,9 @@ yyreduce: } break; - case 177: + case 178: /* Line 1792 of yacc.c */ -#line 523 "./util/configparser.y" +#line 524 "./util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dlv_anchor_file); @@ -2696,9 +2706,9 @@ yyreduce: } break; - case 178: + case 179: /* Line 1792 of yacc.c */ -#line 530 "./util/configparser.y" +#line 531 "./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))) @@ -2706,9 +2716,9 @@ yyreduce: } break; - case 179: + case 180: /* Line 1792 of yacc.c */ -#line 537 "./util/configparser.y" +#line 538 "./util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2717,9 +2727,9 @@ yyreduce: } break; - case 180: + case 181: /* Line 1792 of yacc.c */ -#line 545 "./util/configparser.y" +#line 546 "./util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2728,9 +2738,9 @@ yyreduce: } break; - case 181: + case 182: /* Line 1792 of yacc.c */ -#line 553 "./util/configparser.y" +#line 554 "./util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> @@ -2739,9 +2749,9 @@ yyreduce: } break; - case 182: + case 183: /* Line 1792 of yacc.c */ -#line 561 "./util/configparser.y" +#line 562 "./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))) @@ -2749,9 +2759,9 @@ yyreduce: } break; - case 183: + case 184: /* Line 1792 of yacc.c */ -#line 568 "./util/configparser.y" +#line 569 "./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))) @@ -2759,9 +2769,9 @@ yyreduce: } break; - case 184: + case 185: /* Line 1792 of yacc.c */ -#line 575 "./util/configparser.y" +#line 576 "./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) @@ -2771,9 +2781,9 @@ yyreduce: } break; - case 185: + case 186: /* Line 1792 of yacc.c */ -#line 584 "./util/configparser.y" +#line 585 "./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) @@ -2783,9 +2793,9 @@ yyreduce: } break; - case 186: + case 187: /* Line 1792 of yacc.c */ -#line 593 "./util/configparser.y" +#line 594 "./util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->identity); @@ -2793,9 +2803,9 @@ yyreduce: } break; - case 187: + case 188: /* Line 1792 of yacc.c */ -#line 600 "./util/configparser.y" +#line 601 "./util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->version); @@ -2803,9 +2813,9 @@ yyreduce: } break; - case 188: + case 189: /* Line 1792 of yacc.c */ -#line 607 "./util/configparser.y" +#line 608 "./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)) @@ -2814,9 +2824,9 @@ yyreduce: } break; - case 189: + case 190: /* Line 1792 of yacc.c */ -#line 615 "./util/configparser.y" +#line 616 "./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)) @@ -2825,9 +2835,9 @@ yyreduce: } break; - case 190: + case 191: /* Line 1792 of yacc.c */ -#line 623 "./util/configparser.y" +#line 624 "./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) @@ -2838,9 +2848,9 @@ yyreduce: } break; - case 191: + case 192: /* Line 1792 of yacc.c */ -#line 633 "./util/configparser.y" +#line 634 "./util/configparser.y" { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2851,9 +2861,9 @@ yyreduce: } break; - case 192: + case 193: /* Line 1792 of yacc.c */ -#line 643 "./util/configparser.y" +#line 644 "./util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2867,9 +2877,9 @@ yyreduce: } break; - case 193: + case 194: /* Line 1792 of yacc.c */ -#line 656 "./util/configparser.y" +#line 657 "./util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2881,9 +2891,9 @@ yyreduce: } break; - case 194: + case 195: /* Line 1792 of yacc.c */ -#line 667 "./util/configparser.y" +#line 668 "./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)) @@ -2892,9 +2902,9 @@ yyreduce: } break; - case 195: + case 196: /* Line 1792 of yacc.c */ -#line 675 "./util/configparser.y" +#line 676 "./util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2908,9 +2918,9 @@ yyreduce: } break; - case 196: + case 197: /* Line 1792 of yacc.c */ -#line 688 "./util/configparser.y" +#line 689 "./util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2920,9 +2930,9 @@ yyreduce: } break; - case 197: + case 198: /* Line 1792 of yacc.c */ -#line 697 "./util/configparser.y" +#line 698 "./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) @@ -2932,9 +2942,9 @@ yyreduce: } break; - case 198: + case 199: /* Line 1792 of yacc.c */ -#line 706 "./util/configparser.y" +#line 707 "./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) @@ -2944,9 +2954,9 @@ yyreduce: } break; - case 199: + case 200: /* Line 1792 of yacc.c */ -#line 715 "./util/configparser.y" +#line 716 "./util/configparser.y" { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -2957,9 +2967,9 @@ yyreduce: } break; - case 200: + case 201: /* Line 1792 of yacc.c */ -#line 725 "./util/configparser.y" +#line 726 "./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)) @@ -2968,9 +2978,9 @@ yyreduce: } break; - case 201: + case 202: /* Line 1792 of yacc.c */ -#line 733 "./util/configparser.y" +#line 734 "./util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -2984,9 +2994,9 @@ yyreduce: } break; - case 202: + case 203: /* Line 1792 of yacc.c */ -#line 746 "./util/configparser.y" +#line 747 "./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) @@ -2996,9 +3006,9 @@ yyreduce: } break; - case 203: + case 204: /* Line 1792 of yacc.c */ -#line 755 "./util/configparser.y" +#line 756 "./util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " @@ -3007,9 +3017,9 @@ yyreduce: } break; - case 204: + case 205: /* Line 1792 of yacc.c */ -#line 763 "./util/configparser.y" +#line 764 "./util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3019,9 +3029,9 @@ yyreduce: } break; - case 205: + case 206: /* Line 1792 of yacc.c */ -#line 772 "./util/configparser.y" +#line 773 "./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 " @@ -3030,9 +3040,9 @@ yyreduce: } break; - case 206: + case 207: /* Line 1792 of yacc.c */ -#line 780 "./util/configparser.y" +#line 781 "./util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3046,9 +3056,9 @@ yyreduce: } break; - case 207: + case 208: /* Line 1792 of yacc.c */ -#line 793 "./util/configparser.y" +#line 794 "./util/configparser.y" { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3058,9 +3068,9 @@ yyreduce: } break; - case 208: + case 209: /* Line 1792 of yacc.c */ -#line 802 "./util/configparser.y" +#line 803 "./util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->target_fetch_policy); @@ -3068,9 +3078,9 @@ yyreduce: } break; - case 209: + case 210: /* Line 1792 of yacc.c */ -#line 809 "./util/configparser.y" +#line 810 "./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) @@ -3081,9 +3091,9 @@ yyreduce: } break; - case 210: + case 211: /* Line 1792 of yacc.c */ -#line 819 "./util/configparser.y" +#line 820 "./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) @@ -3094,9 +3104,9 @@ yyreduce: } break; - case 211: + case 212: /* Line 1792 of yacc.c */ -#line 829 "./util/configparser.y" +#line 830 "./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) @@ -3107,9 +3117,9 @@ yyreduce: } break; - case 212: + case 213: /* Line 1792 of yacc.c */ -#line 839 "./util/configparser.y" +#line 840 "./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) @@ -3120,9 +3130,9 @@ yyreduce: } break; - case 213: + case 214: /* Line 1792 of yacc.c */ -#line 849 "./util/configparser.y" +#line 850 "./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) @@ -3133,9 +3143,9 @@ yyreduce: } break; - case 214: + case 215: /* Line 1792 of yacc.c */ -#line 859 "./util/configparser.y" +#line 860 "./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) @@ -3146,9 +3156,9 @@ yyreduce: } break; - case 215: + case 216: /* Line 1792 of yacc.c */ -#line 869 "./util/configparser.y" +#line 870 "./util/configparser.y" { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3159,9 +3169,9 @@ yyreduce: } break; - case 216: + case 217: /* Line 1792 of yacc.c */ -#line 879 "./util/configparser.y" +#line 880 "./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) @@ -3172,9 +3182,9 @@ yyreduce: } break; - case 217: + case 218: /* Line 1792 of yacc.c */ -#line 889 "./util/configparser.y" +#line 890 "./util/configparser.y" { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[(2) - (2)].str))) @@ -3182,9 +3192,9 @@ yyreduce: } break; - case 218: + case 219: /* Line 1792 of yacc.c */ -#line 896 "./util/configparser.y" +#line 897 "./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))) @@ -3192,9 +3202,9 @@ yyreduce: } break; - case 219: + case 220: /* Line 1792 of yacc.c */ -#line 903 "./util/configparser.y" +#line 904 "./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))) @@ -3202,9 +3212,9 @@ yyreduce: } break; - case 220: + case 221: /* Line 1792 of yacc.c */ -#line 910 "./util/configparser.y" +#line 911 "./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) @@ -3214,9 +3224,9 @@ yyreduce: } break; - case 221: + case 222: /* Line 1792 of yacc.c */ -#line 919 "./util/configparser.y" +#line 920 "./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) @@ -3226,9 +3236,9 @@ yyreduce: } break; - case 222: + case 223: /* Line 1792 of yacc.c */ -#line 928 "./util/configparser.y" +#line 929 "./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) @@ -3238,9 +3248,9 @@ yyreduce: } break; - case 223: + case 224: /* Line 1792 of yacc.c */ -#line 937 "./util/configparser.y" +#line 938 "./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))) @@ -3248,9 +3258,9 @@ yyreduce: } break; - case 224: + case 225: /* Line 1792 of yacc.c */ -#line 944 "./util/configparser.y" +#line 945 "./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) @@ -3261,9 +3271,9 @@ yyreduce: } break; - case 225: + case 226: /* Line 1792 of yacc.c */ -#line 954 "./util/configparser.y" +#line 955 "./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 && @@ -3281,9 +3291,9 @@ yyreduce: } break; - case 226: + case 227: /* Line 1792 of yacc.c */ -#line 971 "./util/configparser.y" +#line 972 "./util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->module_conf); @@ -3291,9 +3301,9 @@ yyreduce: } break; - case 227: + case 228: /* Line 1792 of yacc.c */ -#line 978 "./util/configparser.y" +#line 979 "./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) { @@ -3312,9 +3322,9 @@ yyreduce: } break; - case 228: + case 229: /* Line 1792 of yacc.c */ -#line 996 "./util/configparser.y" +#line 997 "./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) { @@ -3328,9 +3338,9 @@ yyreduce: } break; - case 229: + case 230: /* Line 1792 of yacc.c */ -#line 1009 "./util/configparser.y" +#line 1010 "./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) { @@ -3344,9 +3354,9 @@ yyreduce: } break; - case 230: + case 231: /* Line 1792 of yacc.c */ -#line 1022 "./util/configparser.y" +#line 1023 "./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) @@ -3356,9 +3366,9 @@ yyreduce: } break; - case 231: + case 232: /* Line 1792 of yacc.c */ -#line 1031 "./util/configparser.y" +#line 1032 "./util/configparser.y" { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3368,9 +3378,9 @@ yyreduce: } break; - case 232: + case 233: /* Line 1792 of yacc.c */ -#line 1040 "./util/configparser.y" +#line 1041 "./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) @@ -3380,9 +3390,9 @@ yyreduce: } break; - case 233: + case 234: /* Line 1792 of yacc.c */ -#line 1049 "./util/configparser.y" +#line 1050 "./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) @@ -3392,9 +3402,9 @@ yyreduce: } break; - case 234: + case 235: /* Line 1792 of yacc.c */ -#line 1058 "./util/configparser.y" +#line 1059 "./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) @@ -3405,9 +3415,9 @@ yyreduce: } break; - case 235: + case 236: /* Line 1792 of yacc.c */ -#line 1068 "./util/configparser.y" +#line 1069 "./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) @@ -3418,9 +3428,9 @@ yyreduce: } break; - case 236: + case 237: /* Line 1792 of yacc.c */ -#line 1078 "./util/configparser.y" +#line 1079 "./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) @@ -3430,9 +3440,9 @@ yyreduce: } break; - case 237: + case 238: /* Line 1792 of yacc.c */ -#line 1087 "./util/configparser.y" +#line 1088 "./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) @@ -3442,9 +3452,9 @@ yyreduce: } break; - case 238: + case 239: /* Line 1792 of yacc.c */ -#line 1096 "./util/configparser.y" +#line 1097 "./util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); @@ -3452,9 +3462,9 @@ yyreduce: } break; - case 239: + case 240: /* Line 1792 of yacc.c */ -#line 1103 "./util/configparser.y" +#line 1104 "./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) @@ -3464,9 +3474,9 @@ yyreduce: } break; - case 240: + case 241: /* Line 1792 of yacc.c */ -#line 1112 "./util/configparser.y" +#line 1113 "./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) @@ -3476,9 +3486,9 @@ yyreduce: } break; - case 241: + case 242: /* Line 1792 of yacc.c */ -#line 1121 "./util/configparser.y" +#line 1122 "./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) @@ -3488,9 +3498,9 @@ yyreduce: } break; - case 242: + case 243: /* Line 1792 of yacc.c */ -#line 1130 "./util/configparser.y" +#line 1131 "./util/configparser.y" { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3501,9 +3511,9 @@ yyreduce: } break; - case 243: + case 244: /* Line 1792 of yacc.c */ -#line 1139 "./util/configparser.y" +#line 1140 "./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)) @@ -3512,9 +3522,9 @@ yyreduce: } break; - case 244: + case 245: /* Line 1792 of yacc.c */ -#line 1147 "./util/configparser.y" +#line 1148 "./util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3528,9 +3538,9 @@ yyreduce: } break; - case 245: + case 246: /* Line 1792 of yacc.c */ -#line 1160 "./util/configparser.y" +#line 1161 "./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)) @@ -3539,9 +3549,9 @@ yyreduce: } break; - case 246: + case 247: /* Line 1792 of yacc.c */ -#line 1168 "./util/configparser.y" +#line 1169 "./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 && @@ -3566,9 +3576,9 @@ yyreduce: } break; - case 247: + case 248: /* Line 1792 of yacc.c */ -#line 1192 "./util/configparser.y" +#line 1193 "./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))) @@ -3576,9 +3586,9 @@ yyreduce: } break; - case 248: + case 249: /* Line 1792 of yacc.c */ -#line 1199 "./util/configparser.y" +#line 1200 "./util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str))); @@ -3594,9 +3604,9 @@ yyreduce: } break; - case 249: + case 250: /* Line 1792 of yacc.c */ -#line 1214 "./util/configparser.y" +#line 1215 "./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) @@ -3607,9 +3617,9 @@ yyreduce: } break; - case 250: + case 251: /* Line 1792 of yacc.c */ -#line 1224 "./util/configparser.y" +#line 1225 "./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) @@ -3620,9 +3630,9 @@ yyreduce: } break; - case 251: + case 252: /* Line 1792 of yacc.c */ -#line 1234 "./util/configparser.y" +#line 1235 "./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)); @@ -3630,9 +3640,9 @@ yyreduce: } break; - case 252: + case 253: /* Line 1792 of yacc.c */ -#line 1241 "./util/configparser.y" +#line 1242 "./util/configparser.y" { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dns64_prefix); @@ -3640,9 +3650,9 @@ yyreduce: } break; - case 253: + case 254: /* Line 1792 of yacc.c */ -#line 1248 "./util/configparser.y" +#line 1249 "./util/configparser.y" { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3652,9 +3662,9 @@ yyreduce: } break; - case 254: + case 255: /* Line 1792 of yacc.c */ -#line 1257 "./util/configparser.y" +#line 1258 "./util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3664,9 +3674,9 @@ yyreduce: } break; - case 255: + case 256: /* Line 1792 of yacc.c */ -#line 1266 "./util/configparser.y" +#line 1267 "./util/configparser.y" { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[(2) - (2)].str))); if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->ratelimit_size)) @@ -3675,9 +3685,9 @@ yyreduce: } break; - case 256: + case 257: /* Line 1792 of yacc.c */ -#line 1274 "./util/configparser.y" +#line 1275 "./util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3691,9 +3701,9 @@ yyreduce: } break; - case 257: + case 258: /* Line 1792 of yacc.c */ -#line 1287 "./util/configparser.y" +#line 1288 "./util/configparser.y" { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) { @@ -3707,9 +3717,9 @@ yyreduce: } break; - case 258: + case 259: /* Line 1792 of yacc.c */ -#line 1300 "./util/configparser.y" +#line 1301 "./util/configparser.y" { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str))); if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) { @@ -3723,9 +3733,9 @@ yyreduce: } break; - case 259: + case 260: /* Line 1792 of yacc.c */ -#line 1313 "./util/configparser.y" +#line 1314 "./util/configparser.y" { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0) @@ -3735,9 +3745,22 @@ yyreduce: } break; - case 260: + case 261: +/* Line 1792 of yacc.c */ +#line 1323 "./util/configparser.y" + { + OUTYY(("P(server_qname_minimisation:%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->qname_minimisation = + (strcmp((yyvsp[(2) - (2)].str), "yes")==0); + free((yyvsp[(2) - (2)].str)); + } + break; + + case 262: /* Line 1792 of yacc.c */ -#line 1322 "./util/configparser.y" +#line 1333 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->stubs->name) @@ -3748,9 +3771,9 @@ yyreduce: } break; - case 261: + case 263: /* Line 1792 of yacc.c */ -#line 1332 "./util/configparser.y" +#line 1343 "./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))) @@ -3758,9 +3781,9 @@ yyreduce: } break; - case 262: + case 264: /* Line 1792 of yacc.c */ -#line 1339 "./util/configparser.y" +#line 1350 "./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))) @@ -3768,9 +3791,9 @@ yyreduce: } break; - case 263: + case 265: /* Line 1792 of yacc.c */ -#line 1346 "./util/configparser.y" +#line 1357 "./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) @@ -3780,9 +3803,9 @@ yyreduce: } break; - case 264: + case 266: /* Line 1792 of yacc.c */ -#line 1355 "./util/configparser.y" +#line 1366 "./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) @@ -3793,9 +3816,9 @@ yyreduce: } break; - case 265: + case 267: /* Line 1792 of yacc.c */ -#line 1365 "./util/configparser.y" +#line 1376 "./util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str))); if(cfg_parser->cfg->forwards->name) @@ -3806,9 +3829,9 @@ yyreduce: } break; - case 266: + case 268: /* Line 1792 of yacc.c */ -#line 1375 "./util/configparser.y" +#line 1386 "./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))) @@ -3816,9 +3839,9 @@ yyreduce: } break; - case 267: + case 269: /* Line 1792 of yacc.c */ -#line 1382 "./util/configparser.y" +#line 1393 "./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))) @@ -3826,9 +3849,9 @@ yyreduce: } break; - case 268: + case 270: /* Line 1792 of yacc.c */ -#line 1389 "./util/configparser.y" +#line 1400 "./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) @@ -3838,17 +3861,17 @@ yyreduce: } break; - case 269: + case 271: /* Line 1792 of yacc.c */ -#line 1398 "./util/configparser.y" +#line 1409 "./util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } break; - case 280: + case 282: /* Line 1792 of yacc.c */ -#line 1409 "./util/configparser.y" +#line 1420 "./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) @@ -3859,9 +3882,9 @@ yyreduce: } break; - case 281: + case 283: /* Line 1792 of yacc.c */ -#line 1419 "./util/configparser.y" +#line 1430 "./util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str))); if(atoi((yyvsp[(2) - (2)].str)) == 0) @@ -3871,9 +3894,9 @@ yyreduce: } break; - case 282: + case 284: /* Line 1792 of yacc.c */ -#line 1428 "./util/configparser.y" +#line 1439 "./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))) @@ -3881,9 +3904,9 @@ yyreduce: } break; - case 283: + case 285: /* Line 1792 of yacc.c */ -#line 1435 "./util/configparser.y" +#line 1446 "./util/configparser.y" { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3894,9 +3917,9 @@ yyreduce: } break; - case 284: + case 286: /* Line 1792 of yacc.c */ -#line 1445 "./util/configparser.y" +#line 1456 "./util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_key_file); @@ -3904,9 +3927,9 @@ yyreduce: } break; - case 285: + case 287: /* Line 1792 of yacc.c */ -#line 1452 "./util/configparser.y" +#line 1463 "./util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->server_cert_file); @@ -3914,9 +3937,9 @@ yyreduce: } break; - case 286: + case 288: /* Line 1792 of yacc.c */ -#line 1459 "./util/configparser.y" +#line 1470 "./util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_key_file); @@ -3924,9 +3947,9 @@ yyreduce: } break; - case 287: + case 289: /* Line 1792 of yacc.c */ -#line 1466 "./util/configparser.y" +#line 1477 "./util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->control_cert_file); @@ -3934,17 +3957,17 @@ yyreduce: } break; - case 288: + case 290: /* Line 1792 of yacc.c */ -#line 1473 "./util/configparser.y" +#line 1484 "./util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } break; - case 303: + case 305: /* Line 1792 of yacc.c */ -#line 1490 "./util/configparser.y" +#line 1501 "./util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3953,9 +3976,9 @@ yyreduce: } break; - case 304: + case 306: /* Line 1792 of yacc.c */ -#line 1498 "./util/configparser.y" +#line 1509 "./util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_socket_path); @@ -3963,9 +3986,9 @@ yyreduce: } break; - case 305: + case 307: /* Line 1792 of yacc.c */ -#line 1505 "./util/configparser.y" +#line 1516 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3974,9 +3997,9 @@ yyreduce: } break; - case 306: + case 308: /* Line 1792 of yacc.c */ -#line 1513 "./util/configparser.y" +#line 1524 "./util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -3985,9 +4008,9 @@ yyreduce: } break; - case 307: + case 309: /* Line 1792 of yacc.c */ -#line 1521 "./util/configparser.y" +#line 1532 "./util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_identity); @@ -3995,9 +4018,9 @@ yyreduce: } break; - case 308: + case 310: /* Line 1792 of yacc.c */ -#line 1528 "./util/configparser.y" +#line 1539 "./util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->dnstap_version); @@ -4005,9 +4028,9 @@ yyreduce: } break; - case 309: + case 311: /* Line 1792 of yacc.c */ -#line 1535 "./util/configparser.y" +#line 1546 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4017,9 +4040,9 @@ yyreduce: } break; - case 310: + case 312: /* Line 1792 of yacc.c */ -#line 1544 "./util/configparser.y" +#line 1555 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4029,9 +4052,9 @@ yyreduce: } break; - case 311: + case 313: /* Line 1792 of yacc.c */ -#line 1553 "./util/configparser.y" +#line 1564 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4041,9 +4064,9 @@ yyreduce: } break; - case 312: + case 314: /* Line 1792 of yacc.c */ -#line 1562 "./util/configparser.y" +#line 1573 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4053,9 +4076,9 @@ yyreduce: } break; - case 313: + case 315: /* Line 1792 of yacc.c */ -#line 1571 "./util/configparser.y" +#line 1582 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4065,9 +4088,9 @@ yyreduce: } break; - case 314: + case 316: /* Line 1792 of yacc.c */ -#line 1580 "./util/configparser.y" +#line 1591 "./util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[(2) - (2)].str))); if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0) @@ -4077,17 +4100,17 @@ yyreduce: } break; - case 315: + case 317: /* Line 1792 of yacc.c */ -#line 1589 "./util/configparser.y" +#line 1600 "./util/configparser.y" { OUTYY(("\nP(python:)\n")); } break; - case 319: + case 321: /* Line 1792 of yacc.c */ -#line 1598 "./util/configparser.y" +#line 1609 "./util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str))); free(cfg_parser->cfg->python_script); @@ -4097,7 +4120,7 @@ yyreduce: /* Line 1792 of yacc.c */ -#line 4101 "util/configparser.c" +#line 4124 "util/configparser.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4329,7 +4352,7 @@ yyreturn: /* Line 2055 of yacc.c */ -#line 1603 "./util/configparser.y" +#line 1614 "./util/configparser.y" /* parse helper routines could be here */ |