From: Dave Hart Date: Mon, 28 Sep 2009 00:58:51 +0000 (+0000) Subject: [Bug 1323] Implement "revoke #" to match documentation, deprecate X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e91586d90d4603dbc2afb13e0f5504f157a4121;p=thirdparty%2Fntp.git [Bug 1323] Implement "revoke #" to match documentation, deprecate "crypto revoke #". bk: 4ac00a4bqZuBvLd78AgMX-xzdP5QKQ --- diff --git a/ChangeLog b/ChangeLog index 1ce2bde684..6d120de2b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +* [Bug 1323] Implement "revoke #" to match documentation, deprecate + "crypto revoke #". (4.2.5p222) 2009/09/27 Released by Harlan Stenn * Update libisc code using bind-9.6.1-P1.tar.gz, rearrange our copy to mirror the upstream layout (lib/isc/...), and merge in NTP-local diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index 77e6384353..2d353874de 100644 --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -657,12 +657,9 @@ dump_config_tree( } list_ptr = queue_head(ptree->auth.crypto_cmd_list); - if (ptree->auth.revoke != 0 || list_ptr != NULL) { + if (list_ptr != NULL) { fprintf(df, "crypto"); - if (ptree->auth.revoke != 0) - fprintf(df, " revoke %d", ptree->auth.revoke); - for (; list_ptr != NULL; list_ptr = next_node(list_ptr)) { @@ -673,6 +670,9 @@ dump_config_tree( fprintf(df, "\n"); } + if (ptree->auth.revoke != 0) + fprintf(df, "revoke %d\n", ptree->auth.revoke); + if (NULL != ptree->auth.keysdir) fprintf(df, "keysdir \"%s\"\n", ptree->auth.keysdir); diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index f5becf8904..588eeda191 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -709,18 +709,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 171 +#define YYFINAL 173 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 656 +#define YYLAST 660 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 168 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 68 /* YYNRULES -- Number of rules. */ -#define YYNRULES 244 +#define YYNRULES 245 /* YYNRULES -- Number of states. */ -#define YYNSTATES 382 +#define YYNSTATES 384 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -787,25 +787,25 @@ static const yytype_uint16 yyprhs[] = 67, 70, 72, 74, 77, 79, 81, 84, 87, 90, 92, 94, 96, 98, 100, 103, 106, 109, 112, 114, 116, 118, 121, 124, 127, 130, 133, 136, 139, 142, - 145, 148, 150, 151, 154, 156, 159, 162, 165, 168, - 171, 174, 177, 180, 182, 185, 188, 191, 194, 197, - 200, 203, 206, 209, 212, 215, 218, 221, 225, 228, - 230, 232, 234, 236, 238, 240, 242, 244, 246, 249, - 251, 254, 257, 259, 261, 263, 265, 267, 269, 271, - 273, 275, 277, 279, 282, 286, 290, 295, 300, 306, - 307, 310, 312, 314, 316, 318, 320, 322, 324, 326, - 328, 330, 332, 334, 336, 338, 341, 343, 346, 349, - 352, 356, 359, 361, 364, 367, 370, 373, 376, 379, - 382, 385, 388, 391, 394, 396, 398, 400, 402, 404, - 406, 408, 410, 413, 416, 418, 421, 424, 427, 430, - 433, 436, 439, 441, 445, 447, 450, 453, 456, 459, - 462, 465, 468, 471, 474, 477, 480, 483, 487, 490, - 493, 495, 498, 499, 504, 508, 511, 513, 516, 519, - 522, 524, 526, 530, 534, 536, 538, 540, 542, 544, - 546, 548, 550, 552, 555, 557, 560, 562, 565, 567, - 569, 571, 573, 575, 577, 583, 585, 589, 592, 596, - 600, 603, 605, 611, 616, 620, 623, 625, 632, 636, - 639, 643, 647, 651, 655 + 145, 148, 151, 153, 154, 157, 159, 162, 165, 168, + 171, 174, 177, 180, 183, 185, 188, 191, 194, 197, + 200, 203, 206, 209, 212, 215, 218, 221, 224, 228, + 231, 233, 235, 237, 239, 241, 243, 245, 247, 249, + 252, 254, 257, 260, 262, 264, 266, 268, 270, 272, + 274, 276, 278, 280, 282, 285, 289, 293, 298, 303, + 309, 310, 313, 315, 317, 319, 321, 323, 325, 327, + 329, 331, 333, 335, 337, 339, 341, 344, 346, 349, + 352, 355, 359, 362, 364, 367, 370, 373, 376, 379, + 382, 385, 388, 391, 394, 397, 399, 401, 403, 405, + 407, 409, 411, 413, 416, 419, 421, 424, 427, 430, + 433, 436, 439, 442, 444, 448, 450, 453, 456, 459, + 462, 465, 468, 471, 474, 477, 480, 483, 486, 490, + 493, 496, 498, 501, 502, 507, 511, 514, 516, 519, + 522, 525, 527, 529, 533, 537, 539, 541, 543, 545, + 547, 549, 551, 553, 555, 558, 560, 563, 565, 568, + 570, 572, 574, 576, 578, 580, 586, 588, 592, 595, + 599, 603, 606, 608, 614, 619, 623, 626, 628, 635, + 639, 642, 646, 650, 654, 658 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -825,58 +825,59 @@ static const yytype_int16 yyrhs[] = 174, -1, 144, -1, 145, -1, 14, -1, 73, 221, -1, 87, 221, -1, 8, 52, -1, 22, 52, -1, 23, 182, -1, 60, 131, -1, 61, 131, -1, 118, - 52, -1, 141, 219, -1, 100, 131, -1, 183, -1, - -1, 183, 184, -1, 184, -1, 46, 131, -1, 49, - 131, -1, 113, 131, -1, 115, 131, -1, 124, 131, - -1, 120, 52, -1, 138, 186, -1, 186, 187, -1, - 187, -1, 19, 52, -1, 43, 52, -1, 21, 222, - -1, 101, 52, -1, 80, 223, -1, 76, 223, -1, - 79, 223, -1, 75, 223, -1, 83, 52, -1, 11, - 52, -1, 77, 52, -1, 125, 189, -1, 127, 131, - -1, 37, 190, 191, -1, 189, 190, -1, 190, -1, - 20, -1, 24, -1, 70, -1, 104, -1, 116, -1, - 132, -1, 136, -1, 112, -1, 191, 192, -1, 192, - -1, 36, 131, -1, 143, 193, -1, 66, -1, 89, - -1, 33, -1, 27, -1, 91, -1, 106, -1, 25, - -1, 148, -1, 86, -1, 151, -1, 3, -1, 28, - 197, -1, 119, 174, 195, -1, 119, 26, 195, -1, - 119, 55, 26, 195, -1, 119, 57, 26, 195, -1, - 119, 175, 74, 175, 195, -1, -1, 195, 196, -1, - 42, -1, 50, -1, 62, -1, 63, -1, 65, -1, - 71, -1, 90, -1, 92, -1, 93, -1, 95, -1, - 96, -1, 97, -1, 99, -1, 146, -1, 197, 198, - -1, 198, -1, 9, 52, -1, 81, 52, -1, 85, - 52, -1, 45, 174, 200, -1, 200, 201, -1, 201, - -1, 134, 223, -1, 135, 223, -1, 130, 52, -1, - 117, 131, -1, 38, 222, -1, 39, 222, -1, 40, - 222, -1, 41, 222, -1, 33, 203, -1, 27, 203, - -1, 203, 204, -1, 204, -1, 6, -1, 10, -1, - 17, -1, 58, -1, 85, -1, 98, -1, 126, -1, - 137, 206, -1, 206, 207, -1, 207, -1, 5, 223, - -1, 29, 223, -1, 44, 223, -1, 47, 223, -1, - 102, 223, -1, 128, 223, -1, 129, 223, -1, 215, - -1, 51, 131, 171, -1, 34, -1, 15, 223, -1, - 18, 52, -1, 133, 223, -1, 31, 209, -1, 64, - 131, -1, 107, 131, -1, 69, 131, -1, 68, 213, - -1, 105, 220, -1, 121, 131, -1, 123, 210, -1, - 139, 175, -1, 139, 175, 211, -1, 142, 219, -1, - 114, 131, -1, 131, -1, 131, 30, -1, -1, 131, - 165, 131, 26, -1, 131, 165, 131, -1, 211, 212, - -1, 212, -1, 109, 52, -1, 53, 175, -1, 213, - 214, -1, 214, -1, 131, -1, 216, 218, 217, -1, - 216, 218, 131, -1, 53, -1, 88, -1, 4, -1, - 54, -1, 56, -1, 149, -1, 67, -1, 50, -1, - 32, -1, 219, 52, -1, 52, -1, 220, 131, -1, - 131, -1, 221, 174, -1, 174, -1, 52, -1, 140, - -1, 35, -1, 52, -1, 30, -1, 225, 166, 226, - 228, 167, -1, 155, -1, 226, 227, 154, -1, 227, - 154, -1, 156, 165, 223, -1, 157, 165, 223, -1, - 228, 229, -1, 229, -1, 231, 166, 230, 232, 167, - -1, 158, 165, 223, 154, -1, 122, 165, 174, -1, - 232, 233, -1, 233, -1, 159, 165, 223, 166, 234, - 167, -1, 234, 235, 154, -1, 235, 154, -1, 160, - 165, 223, -1, 161, 165, 223, -1, 162, 165, 223, - -1, 163, 165, 223, -1, 164, 165, 223, -1 + 52, -1, 120, 52, -1, 141, 219, -1, 100, 131, + -1, 183, -1, -1, 183, 184, -1, 184, -1, 46, + 131, -1, 49, 131, -1, 113, 131, -1, 115, 131, + -1, 124, 131, -1, 120, 52, -1, 138, 186, -1, + 186, 187, -1, 187, -1, 19, 52, -1, 43, 52, + -1, 21, 222, -1, 101, 52, -1, 80, 223, -1, + 76, 223, -1, 79, 223, -1, 75, 223, -1, 83, + 52, -1, 11, 52, -1, 77, 52, -1, 125, 189, + -1, 127, 131, -1, 37, 190, 191, -1, 189, 190, + -1, 190, -1, 20, -1, 24, -1, 70, -1, 104, + -1, 116, -1, 132, -1, 136, -1, 112, -1, 191, + 192, -1, 192, -1, 36, 131, -1, 143, 193, -1, + 66, -1, 89, -1, 33, -1, 27, -1, 91, -1, + 106, -1, 25, -1, 148, -1, 86, -1, 151, -1, + 3, -1, 28, 197, -1, 119, 174, 195, -1, 119, + 26, 195, -1, 119, 55, 26, 195, -1, 119, 57, + 26, 195, -1, 119, 175, 74, 175, 195, -1, -1, + 195, 196, -1, 42, -1, 50, -1, 62, -1, 63, + -1, 65, -1, 71, -1, 90, -1, 92, -1, 93, + -1, 95, -1, 96, -1, 97, -1, 99, -1, 146, + -1, 197, 198, -1, 198, -1, 9, 52, -1, 81, + 52, -1, 85, 52, -1, 45, 174, 200, -1, 200, + 201, -1, 201, -1, 134, 223, -1, 135, 223, -1, + 130, 52, -1, 117, 131, -1, 38, 222, -1, 39, + 222, -1, 40, 222, -1, 41, 222, -1, 33, 203, + -1, 27, 203, -1, 203, 204, -1, 204, -1, 6, + -1, 10, -1, 17, -1, 58, -1, 85, -1, 98, + -1, 126, -1, 137, 206, -1, 206, 207, -1, 207, + -1, 5, 223, -1, 29, 223, -1, 44, 223, -1, + 47, 223, -1, 102, 223, -1, 128, 223, -1, 129, + 223, -1, 215, -1, 51, 131, 171, -1, 34, -1, + 15, 223, -1, 18, 52, -1, 133, 223, -1, 31, + 209, -1, 64, 131, -1, 107, 131, -1, 69, 131, + -1, 68, 213, -1, 105, 220, -1, 121, 131, -1, + 123, 210, -1, 139, 175, -1, 139, 175, 211, -1, + 142, 219, -1, 114, 131, -1, 131, -1, 131, 30, + -1, -1, 131, 165, 131, 26, -1, 131, 165, 131, + -1, 211, 212, -1, 212, -1, 109, 52, -1, 53, + 175, -1, 213, 214, -1, 214, -1, 131, -1, 216, + 218, 217, -1, 216, 218, 131, -1, 53, -1, 88, + -1, 4, -1, 54, -1, 56, -1, 149, -1, 67, + -1, 50, -1, 32, -1, 219, 52, -1, 52, -1, + 220, 131, -1, 131, -1, 221, 174, -1, 174, -1, + 52, -1, 140, -1, 35, -1, 52, -1, 30, -1, + 225, 166, 226, 228, 167, -1, 155, -1, 226, 227, + 154, -1, 227, 154, -1, 156, 165, 223, -1, 157, + 165, 223, -1, 228, 229, -1, 229, -1, 231, 166, + 230, 232, 167, -1, 158, 165, 223, 154, -1, 122, + 165, 174, -1, 232, 233, -1, 233, -1, 159, 165, + 223, 166, 234, 167, -1, 234, 235, 154, -1, 235, + 154, -1, 160, 165, 223, -1, 161, 165, 223, -1, + 162, 165, 223, -1, 163, 165, 223, -1, 164, 165, + 223, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -888,25 +889,25 @@ static const yytype_uint16 yyrline[] = 369, 370, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 397, 405, 406, 416, 418, 420, 431, 433, 435, 440, 442, 444, 446, - 448, 453, 455, 459, 466, 476, 478, 480, 482, 484, - 486, 499, 504, 505, 509, 511, 513, 515, 517, 519, - 521, 523, 525, 527, 529, 539, 541, 550, 558, 559, - 563, 564, 565, 566, 567, 568, 569, 570, 574, 581, - 591, 601, 610, 619, 628, 629, 633, 634, 635, 636, - 637, 638, 639, 648, 652, 657, 662, 675, 688, 697, - 698, 703, 704, 705, 706, 707, 708, 709, 710, 711, - 712, 713, 714, 715, 716, 720, 722, 727, 728, 729, - 737, 742, 744, 749, 750, 751, 752, 753, 754, 755, - 756, 764, 766, 771, 778, 788, 789, 790, 791, 792, - 793, 794, 810, 814, 815, 819, 820, 821, 822, 823, - 824, 825, 834, 835, 851, 857, 859, 861, 863, 865, - 868, 870, 881, 883, 885, 895, 897, 899, 901, 903, - 908, 910, 914, 918, 920, 925, 927, 931, 932, 936, - 937, 941, 956, 961, 969, 970, 974, 975, 976, 977, - 981, 982, 983, 993, 994, 998, 999, 1003, 1004, 1008, - 1017, 1018, 1022, 1023, 1032, 1047, 1051, 1052, 1056, 1057, - 1061, 1062, 1066, 1071, 1075, 1079, 1080, 1084, 1089, 1090, - 1094, 1096, 1098, 1100, 1102 + 448, 450, 455, 457, 461, 468, 478, 480, 482, 484, + 486, 488, 505, 510, 511, 515, 517, 519, 521, 523, + 525, 527, 529, 531, 533, 535, 545, 547, 556, 564, + 565, 569, 570, 571, 572, 573, 574, 575, 576, 580, + 587, 597, 607, 616, 625, 634, 635, 639, 640, 641, + 642, 643, 644, 645, 654, 658, 663, 668, 681, 694, + 703, 704, 709, 710, 711, 712, 713, 714, 715, 716, + 717, 718, 719, 720, 721, 722, 726, 728, 733, 734, + 735, 743, 748, 750, 755, 756, 757, 758, 759, 760, + 761, 762, 770, 772, 777, 784, 794, 795, 796, 797, + 798, 799, 800, 816, 820, 821, 825, 826, 827, 828, + 829, 830, 831, 840, 841, 857, 863, 865, 867, 869, + 871, 874, 876, 887, 889, 891, 901, 903, 905, 907, + 909, 914, 916, 920, 924, 926, 931, 933, 937, 938, + 942, 943, 947, 962, 967, 975, 976, 980, 981, 982, + 983, 987, 988, 989, 999, 1000, 1004, 1005, 1009, 1010, + 1014, 1023, 1024, 1028, 1029, 1038, 1053, 1057, 1058, 1062, + 1063, 1067, 1068, 1072, 1077, 1081, 1085, 1086, 1090, 1095, + 1096, 1100, 1102, 1104, 1106, 1108 }; #endif @@ -1002,25 +1003,25 @@ static const yytype_uint8 yyr1[] = 176, 176, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, 178, 179, 179, 180, 180, 180, 181, 181, 181, 181, 181, 181, 181, - 181, 182, 182, 183, 183, 184, 184, 184, 184, 184, - 184, 185, 186, 186, 187, 187, 187, 187, 187, 187, - 187, 187, 187, 187, 187, 188, 188, 188, 189, 189, - 190, 190, 190, 190, 190, 190, 190, 190, 191, 191, - 192, 192, 192, 192, 192, 192, 193, 193, 193, 193, - 193, 193, 193, 194, 194, 194, 194, 194, 194, 195, - 195, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 197, 197, 198, 198, 198, - 199, 200, 200, 201, 201, 201, 201, 201, 201, 201, - 201, 202, 202, 203, 203, 204, 204, 204, 204, 204, - 204, 204, 205, 206, 206, 207, 207, 207, 207, 207, - 207, 207, 208, 208, 208, 208, 208, 208, 208, 208, + 181, 181, 182, 182, 183, 183, 184, 184, 184, 184, + 184, 184, 185, 186, 186, 187, 187, 187, 187, 187, + 187, 187, 187, 187, 187, 187, 188, 188, 188, 189, + 189, 190, 190, 190, 190, 190, 190, 190, 190, 191, + 191, 192, 192, 192, 192, 192, 192, 193, 193, 193, + 193, 193, 193, 193, 194, 194, 194, 194, 194, 194, + 195, 195, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 197, 197, 198, 198, + 198, 199, 200, 200, 201, 201, 201, 201, 201, 201, + 201, 201, 202, 202, 203, 203, 204, 204, 204, 204, + 204, 204, 204, 205, 206, 206, 207, 207, 207, 207, + 207, 207, 207, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 209, 209, 209, 210, 210, 211, 211, 212, 212, 213, - 213, 214, 215, 215, 216, 216, 217, 217, 217, 217, - 218, 218, 218, 219, 219, 220, 220, 221, 221, 222, - 222, 222, 223, 223, 224, 225, 226, 226, 227, 227, - 228, 228, 229, 230, 231, 232, 232, 233, 234, 234, - 235, 235, 235, 235, 235 + 208, 209, 209, 209, 210, 210, 211, 211, 212, 212, + 213, 213, 214, 215, 215, 216, 216, 217, 217, 217, + 217, 218, 218, 218, 219, 219, 220, 220, 221, 221, + 222, 222, 222, 223, 223, 224, 225, 226, 226, 227, + 227, 228, 228, 229, 230, 231, 232, 232, 233, 234, + 234, 235, 235, 235, 235, 235 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1032,25 +1033,25 @@ static const yytype_uint8 yyr2[] = 2, 1, 1, 2, 1, 1, 2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 1, 0, 2, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 3, 3, 4, 4, 5, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 1, 2, 2, 2, - 3, 2, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 1, 2, 2, 2, 2, 2, - 2, 2, 1, 3, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, - 1, 2, 0, 4, 3, 2, 1, 2, 2, 2, - 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 1, 2, 1, 2, 1, 1, - 1, 1, 1, 1, 5, 1, 3, 2, 3, 3, - 2, 1, 5, 4, 3, 2, 1, 6, 3, 2, - 3, 3, 3, 3, 3 + 2, 2, 1, 0, 2, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 3, 3, 4, 4, 5, + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 1, 2, 2, + 2, 3, 2, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 2, 1, 2, 2, 2, 2, + 2, 2, 2, 1, 3, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, + 2, 1, 2, 0, 4, 3, 2, 1, 2, 2, + 2, 1, 1, 3, 3, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, + 1, 1, 1, 1, 1, 5, 1, 3, 2, 3, + 3, 2, 1, 5, 4, 3, 2, 1, 6, 3, + 2, 3, 3, 3, 3, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1058,115 +1059,115 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 24, 50, 0, 0, 0, 62, 0, - 0, 192, 0, 174, 0, 0, 0, 204, 0, 0, - 0, 0, 0, 25, 0, 0, 205, 0, 23, 0, - 0, 22, 0, 0, 0, 0, 21, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 48, 49, 225, 0, - 2, 0, 7, 0, 8, 0, 9, 10, 13, 11, - 12, 14, 15, 16, 17, 172, 0, 18, 0, 5, - 53, 223, 222, 175, 176, 54, 0, 0, 0, 0, - 0, 0, 55, 61, 64, 155, 156, 157, 158, 159, - 160, 161, 152, 154, 0, 0, 0, 113, 136, 190, - 178, 151, 90, 91, 92, 93, 97, 94, 95, 96, - 0, 0, 0, 29, 0, 26, 6, 56, 57, 179, - 201, 182, 200, 181, 218, 51, 52, 60, 216, 183, - 180, 189, 58, 119, 0, 0, 119, 26, 184, 0, - 185, 85, 89, 86, 177, 0, 0, 0, 0, 0, - 0, 0, 162, 164, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 71, 73, 186, 214, 59, - 188, 1, 0, 4, 20, 47, 212, 211, 210, 0, - 0, 65, 66, 67, 68, 70, 69, 63, 153, 137, - 138, 139, 135, 191, 105, 104, 0, 102, 103, 0, - 87, 99, 27, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 140, 142, 173, 199, 217, 215, 115, 119, - 119, 114, 0, 0, 88, 165, 166, 167, 168, 169, - 170, 171, 163, 83, 74, 221, 219, 220, 76, 75, - 81, 79, 84, 80, 78, 82, 77, 72, 0, 0, - 187, 196, 213, 3, 32, 0, 34, 35, 0, 0, - 0, 0, 39, 40, 41, 42, 0, 0, 43, 19, - 31, 206, 207, 208, 203, 209, 202, 0, 0, 0, - 0, 100, 112, 108, 110, 106, 107, 109, 111, 101, - 98, 147, 148, 149, 150, 146, 145, 143, 144, 141, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, 134, 120, 116, 117, 119, 194, 198, - 197, 195, 33, 36, 38, 37, 45, 44, 46, 30, - 0, 0, 0, 0, 0, 231, 0, 227, 118, 193, - 228, 229, 0, 226, 224, 230, 0, 234, 0, 0, - 0, 0, 0, 236, 0, 0, 232, 235, 233, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 237, 0, 239, 240, 241, 242, 243, - 244, 238 + 0, 0, 0, 24, 50, 0, 0, 0, 63, 0, + 0, 193, 0, 175, 0, 0, 0, 205, 0, 0, + 0, 0, 0, 25, 0, 0, 206, 0, 23, 0, + 0, 22, 0, 0, 0, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 48, 49, 226, + 0, 2, 0, 7, 0, 8, 0, 9, 10, 13, + 11, 12, 14, 15, 16, 17, 173, 0, 18, 0, + 5, 53, 224, 223, 176, 177, 54, 0, 0, 0, + 0, 0, 0, 55, 62, 65, 156, 157, 158, 159, + 160, 161, 162, 153, 155, 0, 0, 0, 114, 137, + 191, 179, 152, 91, 92, 93, 94, 98, 95, 96, + 97, 0, 0, 0, 29, 0, 26, 6, 56, 57, + 180, 202, 183, 201, 182, 219, 51, 52, 61, 217, + 184, 181, 190, 58, 120, 0, 0, 120, 26, 59, + 185, 0, 186, 86, 90, 87, 178, 0, 0, 0, + 0, 0, 0, 0, 163, 165, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 72, 74, 187, + 215, 60, 189, 1, 0, 4, 20, 47, 213, 212, + 211, 0, 0, 66, 67, 68, 69, 71, 70, 64, + 154, 138, 139, 140, 136, 192, 106, 105, 0, 103, + 104, 0, 88, 100, 27, 28, 0, 0, 0, 0, + 0, 0, 0, 0, 141, 143, 174, 200, 218, 216, + 116, 120, 120, 115, 0, 0, 89, 166, 167, 168, + 169, 170, 171, 172, 164, 84, 75, 222, 220, 221, + 77, 76, 82, 80, 85, 81, 79, 83, 78, 73, + 0, 0, 188, 197, 214, 3, 32, 0, 34, 35, + 0, 0, 0, 0, 39, 40, 41, 42, 0, 0, + 43, 19, 31, 207, 208, 209, 204, 210, 203, 0, + 0, 0, 0, 101, 113, 109, 111, 107, 108, 110, + 112, 102, 99, 148, 149, 150, 151, 147, 146, 144, + 145, 142, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 121, 117, 118, 120, + 195, 199, 198, 196, 33, 36, 38, 37, 45, 44, + 46, 30, 0, 0, 0, 0, 0, 232, 0, 228, + 119, 194, 229, 230, 0, 227, 225, 231, 0, 235, + 0, 0, 0, 0, 0, 237, 0, 0, 233, 236, + 234, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 238, 0, 240, 241, 242, + 243, 244, 245, 239 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 49, 50, 51, 52, 53, 124, 115, 269, 270, - 54, 55, 56, 57, 82, 83, 84, 58, 165, 166, - 59, 141, 110, 200, 201, 289, 60, 218, 314, 97, - 98, 61, 212, 213, 62, 92, 93, 63, 152, 153, - 64, 100, 140, 250, 251, 121, 122, 65, 66, 276, - 179, 169, 129, 125, 238, 73, 67, 68, 279, 280, - 334, 335, 349, 336, 352, 353, 366, 367 + -1, 50, 51, 52, 53, 54, 125, 116, 271, 272, + 55, 56, 57, 58, 83, 84, 85, 59, 167, 168, + 60, 143, 111, 202, 203, 291, 61, 220, 316, 98, + 99, 62, 214, 215, 63, 93, 94, 64, 154, 155, + 65, 101, 142, 252, 253, 122, 123, 66, 67, 278, + 181, 171, 130, 126, 240, 74, 68, 69, 281, 282, + 336, 337, 351, 338, 354, 355, 368, 369 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -139 +#define YYPACT_NINF -136 static const yytype_int16 yypact[] = { - 123, -128, -10, -139, -139, -7, -3, 4, 29, 2, - 5, -95, 2, -139, 11, -35, -88, -139, -84, -77, - -74, -72, -68, -139, -35, -35, -139, -59, -139, -58, - -57, -139, -55, 27, -5, -49, -139, -43, 11, -42, - -7, 33, 293, -39, 31, 31, -139, -139, -139, 91, - 274, -60, -139, -35, -139, -35, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -16, -139, -71, -139, - -139, -139, -139, -139, -139, -139, -34, -17, -2, 8, - 47, 9, -139, 29, -139, -139, -139, -139, -139, -139, - -139, -139, 2, -139, 81, 100, 107, 5, -139, 133, - -139, 2, -139, -139, -139, -139, -139, -139, -139, -139, - -18, 34, 35, -139, 63, -139, 409, -139, -139, -139, - -139, -72, -139, -139, -139, -35, -35, -139, -139, 36, - -139, -139, -139, -139, 1, 3, -139, 90, -139, 10, - -139, 11, -139, -139, -139, -7, -7, -7, -7, -7, - -7, -7, 33, -139, 117, 120, -28, 121, -7, -7, - 125, -7, -7, 126, 127, 293, -139, -48, -139, 129, - 129, -139, 32, -139, 451, -139, -139, -139, -139, -1, - -117, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, 54, -139, -139, 7, - -18, -139, -139, -139, -28, -28, -28, -28, 58, 136, - -7, -7, 63, -139, -139, -139, -139, -139, 510, -139, - -139, 510, -39, 73, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -139, -139, -39, 142, - -48, -139, -139, -139, -139, -7, -139, -139, 153, 155, - 156, 157, -139, -139, -139, -139, 160, 161, -139, 451, - -139, -139, -139, -139, -139, -139, -139, 49, 59, -92, - 68, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, 510, 510, -139, 199, -139, - -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -7, -7, 62, 75, -109, -139, 66, -139, 510, -139, - -139, -139, -35, -139, -139, -139, 76, -139, 70, 74, - -7, 71, -126, -139, 84, -7, -139, -139, -139, 77, - 57, 82, 86, 87, 88, 89, 39, 85, -7, -7, - -7, -7, -7, -139, 95, -139, -139, -139, -139, -139, - -139, -139 + 125, -133, -20, -136, -136, -14, -17, -15, -31, 16, + -2, -81, 16, -136, 51, 4, -79, -136, -78, -76, + -74, -73, -64, -136, 4, 4, -136, -63, -136, -59, + -58, -136, -55, 13, -6, 25, -53, -136, -51, 51, + -50, -14, 1, 551, -46, 36, 36, -136, -136, -136, + 90, 275, -62, -136, 4, -136, 4, -136, -136, -136, + -136, -136, -136, -136, -136, -136, -136, -7, -136, -75, + -136, -136, -136, -136, -136, -136, -136, -37, -29, -27, + -26, 75, 5, -136, -31, -136, -136, -136, -136, -136, + -136, -136, -136, 16, -136, 80, 85, 89, -2, -136, + 114, -136, 16, -136, -136, -136, -136, -136, -136, -136, + -136, -19, 14, 15, -136, 165, -136, 410, -136, -136, + -136, -136, -73, -136, -136, -136, 4, 4, -136, -136, + 19, -136, -136, -136, -136, -13, 3, -136, 77, -136, + -136, -11, -136, 51, -136, -136, -136, -14, -14, -14, + -14, -14, -14, -14, 1, -136, 109, 112, -12, 113, + -14, -14, 116, -14, -14, 117, 121, 551, -136, -43, + -136, 122, 122, -136, 12, -136, 479, -136, -136, -136, + -136, 0, -115, -136, -136, -136, -136, -136, -136, -136, + -136, -136, -136, -136, -136, -136, -136, -136, 44, -136, + -136, 9, -19, -136, -136, -136, -12, -12, -12, -12, + 46, 127, -14, -14, 165, -136, -136, -136, -136, -136, + 514, -136, -136, 514, -46, 49, -136, -136, -136, -136, + -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, + -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, + -46, 129, -43, -136, -136, -136, -136, -14, -136, -136, + 130, 136, 138, 140, -136, -136, -136, -136, 143, 144, + -136, 479, -136, -136, -136, -136, -136, -136, -136, 34, + 35, -94, 48, -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, 514, 514, -136, + 175, -136, -136, -136, -136, -136, -136, -136, -136, -136, + -136, -136, -14, -14, 50, 69, -103, -136, 60, -136, + 514, -136, -136, -136, 4, -136, -136, -136, 66, -136, + 62, 70, -14, 71, -128, -136, 81, -14, -136, -136, + -136, 65, 58, 72, 73, 76, 84, 86, 47, 88, + -14, -14, -14, -14, -14, -136, 99, -136, -136, -136, + -136, -136, -136, -136 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -139, -139, -139, -46, -139, -139, -9, -32, -139, -29, - -139, -139, -139, -139, -139, -139, 172, -139, -139, 92, - -139, -139, -21, -139, 69, -139, -139, -135, -139, -139, - 162, -139, -139, 46, -139, 251, -64, -139, -139, 114, - -139, -139, -139, -139, 20, -139, 150, -139, -139, -139, - -139, 227, -139, 248, -138, -40, -139, -139, -139, -4, - -139, -54, -139, -139, -139, -78, -139, -90 + -136, -136, -136, -48, -136, -136, -10, -33, -136, -16, + -136, -136, -136, -136, -136, -136, 150, -136, -136, 87, + -136, -136, -30, -136, 38, -136, -136, -135, -136, -136, + 158, -136, -136, 43, -136, 247, -66, -136, -136, 106, + -136, -136, -136, -136, 20, -136, 139, -136, -136, -136, + -136, 219, -136, 243, -110, -41, -136, -136, -136, -8, + -136, -65, -136, -136, -136, -80, -136, -93 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1176,142 +1177,144 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 144, 221, 137, 271, 172, 248, 114, 235, 85, 194, - 282, 167, 86, 332, 94, 195, 176, 142, 196, 87, - 111, 133, 112, 71, 236, 136, 69, 219, 188, 220, - 332, 102, 283, 351, 177, 103, 99, 188, 145, 277, - 278, 356, 70, 116, 174, 72, 175, 117, 197, 74, - 134, 178, 135, 272, 118, 273, 75, 119, 344, 120, - 88, 249, 146, 123, 277, 278, 291, 292, 293, 294, - 214, 198, 127, 128, 130, 76, 131, 147, 77, 132, - 148, 104, 138, 168, 315, 316, 95, 89, 139, 143, - 96, 171, 113, 284, 173, 180, 113, 181, 285, 185, - 90, 204, 205, 206, 207, 225, 226, 227, 228, 229, - 230, 231, 237, 286, 182, 105, 216, 216, 240, 241, - 224, 243, 244, 106, 1, 199, 113, 107, 91, 183, - 274, 2, 202, 189, 203, 149, 3, 4, 5, 184, - 186, 6, 78, 108, 79, 7, 8, 109, 275, 80, - 9, 10, 190, 81, 11, 287, 12, 13, 288, 191, - 14, 150, 151, 193, 222, 202, 203, 217, 15, 233, - 297, 298, 234, 239, 16, 223, 17, 242, 245, 246, - 208, 252, 338, 18, 19, 281, 253, 20, 296, 295, - 317, 21, 22, 209, 320, 23, 24, 210, 211, 361, - 362, 363, 364, 365, 318, 323, 373, 324, 325, 326, - 25, 26, 327, 328, 330, 322, 319, 361, 362, 363, - 364, 365, 337, 27, 331, 339, 28, 342, 29, 343, - 30, 31, 346, 351, 348, 350, 355, 32, 358, 375, - 329, 33, 34, 360, 35, 36, 37, 368, 38, 381, - 39, 369, 370, 371, 372, 187, 40, 247, 299, 192, - 41, 42, 43, 101, 44, 45, 232, 46, 47, 290, - 321, 215, 170, 126, 357, 333, 374, -6, 48, 0, - 345, 0, 2, 0, 0, 0, 0, 3, 4, 5, - 340, 341, 6, 0, 0, 0, 7, 8, 0, 0, - 0, 9, 10, 0, 154, 11, 0, 12, 13, 0, - 354, 14, 155, 0, 156, 359, 0, 0, 0, 15, - 0, 0, 0, 0, 0, 16, 0, 17, 376, 377, - 378, 379, 380, 347, 18, 19, 157, 0, 20, 0, - 0, 0, 21, 22, 0, 0, 23, 24, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 25, 26, 0, 0, 0, 0, 0, 158, 159, - 160, 0, 161, 162, 27, 0, 163, 28, 0, 29, - 0, 30, 31, 0, 0, 0, 0, 0, 32, 0, - 0, 0, 33, 34, 164, 35, 36, 37, 0, 38, - 0, 39, 0, 0, 0, 0, 0, 40, 0, 0, - 0, 41, 42, 43, 0, 44, 45, 2, 46, 47, - 0, 0, 3, 4, 5, 0, 0, 6, -6, 48, - 0, 7, 8, 0, 0, 0, 9, 10, 0, 0, - 11, 0, 12, 13, 0, 0, 14, 0, 0, 0, - 0, 0, 0, 0, 15, 0, 0, 0, 254, 0, - 16, 0, 17, 255, 0, 0, 0, 256, 0, 18, - 19, 0, 0, 20, 0, 0, 0, 21, 22, 0, - 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 25, 26, 0, 257, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, - 258, 0, 28, 0, 29, 0, 30, 31, 0, 0, - 0, 0, 0, 32, 0, 0, 0, 33, 34, 259, - 35, 36, 37, 260, 38, 261, 39, 0, 0, 0, - 0, 0, 40, 0, 0, 262, 41, 42, 43, 0, - 44, 45, 300, 46, 47, 0, 0, 0, 0, 0, - 301, 263, 264, 0, 48, 0, 0, 0, 0, 0, - 0, 0, 302, 303, 0, 304, 0, 0, 0, 0, - 0, 305, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 265, 0, 266, 0, 0, 0, 267, 0, 0, - 306, 268, 307, 308, 0, 309, 310, 311, 0, 312, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 146, 138, 223, 174, 273, 115, 147, 95, 196, 144, + 250, 169, 284, 221, 197, 77, 72, 198, 78, 334, + 134, 70, 86, 237, 137, 178, 87, 190, 334, 222, + 148, 353, 71, 88, 285, 75, 190, 76, 73, 358, + 238, 279, 280, 179, 176, 149, 177, 199, 150, 135, + 100, 136, 117, 118, 274, 119, 275, 120, 121, 112, + 180, 113, 279, 280, 346, 133, 251, 124, 128, 216, + 200, 103, 129, 131, 89, 104, 132, 139, 140, 96, + 141, 145, 79, 97, 80, 114, 317, 318, 170, 81, + 173, 182, 175, 82, 183, 286, 293, 294, 295, 296, + 287, 90, 184, 151, 185, 186, 227, 228, 229, 230, + 231, 232, 233, 226, 91, 288, 218, 218, 204, 242, + 243, 105, 245, 246, 201, 114, 1, 187, 239, 152, + 153, 276, 191, 2, 205, 114, 188, 192, 3, 4, + 5, 193, 92, 6, 195, 204, 205, 7, 8, 277, + 219, 224, 9, 10, 225, 106, 11, 289, 12, 13, + 290, 235, 14, 107, 236, 241, 255, 108, 244, 247, + 15, 299, 300, 248, 254, 283, 16, 297, 17, 298, + 320, 322, 325, 109, 340, 18, 19, 110, 326, 20, + 327, 319, 328, 21, 22, 329, 330, 23, 24, 332, + 333, 341, 339, 206, 207, 208, 209, 363, 364, 365, + 366, 367, 25, 26, 375, 344, 324, 321, 363, 364, + 365, 366, 367, 345, 350, 27, 348, 352, 28, 353, + 29, 362, 30, 31, 189, 360, 357, 370, 371, 32, + 292, 372, 377, 33, 34, 35, 36, 37, 38, 373, + 39, 374, 40, 383, 249, 331, 194, 301, 41, 102, + 234, 217, 42, 43, 44, 172, 45, 46, 127, 47, + 48, 347, 323, 335, 359, 376, 0, 0, 0, -6, + 49, 0, 210, 2, 0, 0, 0, 0, 3, 4, + 5, 342, 343, 6, 0, 211, 0, 7, 8, 212, + 213, 0, 9, 10, 0, 0, 11, 0, 12, 13, + 0, 356, 14, 0, 0, 0, 361, 0, 0, 0, + 15, 0, 0, 0, 0, 0, 16, 0, 17, 378, + 379, 380, 381, 382, 349, 18, 19, 0, 0, 20, + 0, 0, 0, 21, 22, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 25, 26, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 27, 0, 0, 28, 0, + 29, 0, 30, 31, 0, 0, 0, 0, 0, 32, + 0, 0, 0, 33, 34, 35, 36, 37, 38, 0, + 39, 0, 40, 0, 0, 0, 0, 0, 41, 0, + 0, 0, 42, 43, 44, 0, 45, 46, 2, 47, + 48, 0, 0, 3, 4, 5, 0, 0, 6, -6, + 49, 0, 7, 8, 0, 0, 0, 9, 10, 0, + 0, 11, 0, 12, 13, 0, 0, 14, 0, 0, + 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, + 0, 16, 0, 17, 0, 0, 0, 0, 0, 0, + 18, 19, 0, 0, 20, 0, 0, 0, 21, 22, + 0, 0, 23, 24, 0, 0, 256, 0, 0, 0, + 0, 257, 0, 0, 0, 258, 0, 25, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 27, 0, 0, 28, 0, 29, 0, 30, 31, 0, + 0, 0, 0, 0, 32, 0, 0, 259, 33, 34, + 35, 36, 37, 38, 0, 39, 0, 40, 260, 0, + 0, 0, 0, 41, 0, 0, 0, 42, 43, 44, + 0, 45, 46, 0, 47, 48, 302, 261, 0, 0, + 0, 262, 156, 263, 303, 49, 0, 0, 0, 0, + 157, 0, 158, 264, 0, 0, 304, 305, 0, 306, + 0, 0, 0, 0, 0, 307, 0, 0, 0, 265, + 266, 0, 0, 0, 159, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 308, 0, 309, 310, 0, 311, + 312, 313, 0, 314, 0, 0, 0, 0, 0, 267, + 0, 268, 0, 0, 0, 269, 160, 161, 162, 270, + 163, 164, 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 313 + 0, 0, 166, 0, 0, 0, 0, 0, 0, 0, + 315 }; static const yytype_int16 yycheck[] = { - 40, 136, 34, 4, 50, 53, 15, 35, 6, 27, - 3, 43, 10, 122, 9, 33, 32, 38, 36, 17, - 55, 26, 57, 30, 52, 34, 154, 26, 92, 26, - 122, 20, 25, 159, 50, 24, 131, 101, 5, 156, - 157, 167, 52, 131, 53, 52, 55, 131, 66, 52, - 55, 67, 57, 54, 131, 56, 52, 131, 167, 131, - 58, 109, 29, 131, 156, 157, 204, 205, 206, 207, - 116, 89, 131, 131, 131, 46, 131, 44, 49, 52, - 47, 70, 131, 52, 219, 220, 81, 85, 131, 131, - 85, 0, 131, 86, 154, 166, 131, 131, 91, 52, - 98, 38, 39, 40, 41, 145, 146, 147, 148, 149, - 150, 151, 140, 106, 131, 104, 125, 126, 158, 159, - 141, 161, 162, 112, 1, 143, 131, 116, 126, 131, - 131, 8, 131, 52, 131, 102, 13, 14, 15, 131, - 131, 18, 113, 132, 115, 22, 23, 136, 149, 120, - 27, 28, 52, 124, 31, 148, 33, 34, 151, 52, - 37, 128, 129, 30, 74, 131, 131, 131, 45, 52, - 210, 211, 52, 52, 51, 165, 53, 52, 52, 52, - 117, 52, 317, 60, 61, 131, 154, 64, 52, 131, - 222, 68, 69, 130, 52, 72, 73, 134, 135, 160, - 161, 162, 163, 164, 131, 52, 167, 52, 52, 52, - 87, 88, 52, 52, 165, 255, 248, 160, 161, 162, - 163, 164, 154, 100, 165, 26, 103, 165, 105, 154, - 107, 108, 166, 159, 158, 165, 165, 114, 154, 154, - 269, 118, 119, 166, 121, 122, 123, 165, 125, 154, - 127, 165, 165, 165, 165, 83, 133, 165, 212, 97, - 137, 138, 139, 12, 141, 142, 152, 144, 145, 200, - 250, 121, 45, 25, 352, 279, 366, 154, 155, -1, - 334, -1, 8, -1, -1, -1, -1, 13, 14, 15, - 330, 331, 18, -1, -1, -1, 22, 23, -1, -1, - -1, 27, 28, -1, 11, 31, -1, 33, 34, -1, - 350, 37, 19, -1, 21, 355, -1, -1, -1, 45, - -1, -1, -1, -1, -1, 51, -1, 53, 368, 369, - 370, 371, 372, 342, 60, 61, 43, -1, 64, -1, - -1, -1, 68, 69, -1, -1, 72, 73, -1, -1, + 41, 34, 137, 51, 4, 15, 5, 9, 27, 39, + 53, 44, 3, 26, 33, 46, 30, 36, 49, 122, + 26, 154, 6, 35, 34, 32, 10, 93, 122, 26, + 29, 159, 52, 17, 25, 52, 102, 52, 52, 167, + 52, 156, 157, 50, 54, 44, 56, 66, 47, 55, + 131, 57, 131, 131, 54, 131, 56, 131, 131, 55, + 67, 57, 156, 157, 167, 52, 109, 131, 131, 117, + 89, 20, 131, 131, 58, 24, 131, 52, 131, 81, + 131, 131, 113, 85, 115, 131, 221, 222, 52, 120, + 0, 166, 154, 124, 131, 86, 206, 207, 208, 209, + 91, 85, 131, 102, 131, 131, 147, 148, 149, 150, + 151, 152, 153, 143, 98, 106, 126, 127, 131, 160, + 161, 70, 163, 164, 143, 131, 1, 52, 140, 128, + 129, 131, 52, 8, 131, 131, 131, 52, 13, 14, + 15, 52, 126, 18, 30, 131, 131, 22, 23, 149, + 131, 74, 27, 28, 165, 104, 31, 148, 33, 34, + 151, 52, 37, 112, 52, 52, 154, 116, 52, 52, + 45, 212, 213, 52, 52, 131, 51, 131, 53, 52, + 131, 52, 52, 132, 319, 60, 61, 136, 52, 64, + 52, 224, 52, 68, 69, 52, 52, 72, 73, 165, + 165, 26, 154, 38, 39, 40, 41, 160, 161, 162, + 163, 164, 87, 88, 167, 165, 257, 250, 160, 161, + 162, 163, 164, 154, 158, 100, 166, 165, 103, 159, + 105, 166, 107, 108, 84, 154, 165, 165, 165, 114, + 202, 165, 154, 118, 119, 120, 121, 122, 123, 165, + 125, 165, 127, 154, 167, 271, 98, 214, 133, 12, + 154, 122, 137, 138, 139, 46, 141, 142, 25, 144, + 145, 336, 252, 281, 354, 368, -1, -1, -1, 154, + 155, -1, 117, 8, -1, -1, -1, -1, 13, 14, + 15, 332, 333, 18, -1, 130, -1, 22, 23, 134, + 135, -1, 27, 28, -1, -1, 31, -1, 33, 34, + -1, 352, 37, -1, -1, -1, 357, -1, -1, -1, + 45, -1, -1, -1, -1, -1, 51, -1, 53, 370, + 371, 372, 373, 374, 344, 60, 61, -1, -1, 64, + -1, -1, -1, 68, 69, -1, -1, 72, 73, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, -1, -1, -1, -1, -1, 75, 76, - 77, -1, 79, 80, 100, -1, 83, 103, -1, 105, - -1, 107, 108, -1, -1, -1, -1, -1, 114, -1, - -1, -1, 118, 119, 101, 121, 122, 123, -1, 125, - -1, 127, -1, -1, -1, -1, -1, 133, -1, -1, - -1, 137, 138, 139, -1, 141, 142, 8, 144, 145, - -1, -1, 13, 14, 15, -1, -1, 18, 154, 155, - -1, 22, 23, -1, -1, -1, 27, 28, -1, -1, - 31, -1, 33, 34, -1, -1, 37, -1, -1, -1, - -1, -1, -1, -1, 45, -1, -1, -1, 7, -1, - 51, -1, 53, 12, -1, -1, -1, 16, -1, 60, - 61, -1, -1, 64, -1, -1, -1, 68, 69, -1, - -1, 72, 73, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 87, 88, -1, 48, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 100, - 59, -1, 103, -1, 105, -1, 107, 108, -1, -1, - -1, -1, -1, 114, -1, -1, -1, 118, 119, 78, - 121, 122, 123, 82, 125, 84, 127, -1, -1, -1, - -1, -1, 133, -1, -1, 94, 137, 138, 139, -1, - 141, 142, 42, 144, 145, -1, -1, -1, -1, -1, - 50, 110, 111, -1, 155, -1, -1, -1, -1, -1, - -1, -1, 62, 63, -1, 65, -1, -1, -1, -1, - -1, 71, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 140, -1, 142, -1, -1, -1, 146, -1, -1, - 90, 150, 92, 93, -1, 95, 96, 97, -1, 99, + -1, -1, 87, 88, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 100, -1, -1, 103, -1, + 105, -1, 107, 108, -1, -1, -1, -1, -1, 114, + -1, -1, -1, 118, 119, 120, 121, 122, 123, -1, + 125, -1, 127, -1, -1, -1, -1, -1, 133, -1, + -1, -1, 137, 138, 139, -1, 141, 142, 8, 144, + 145, -1, -1, 13, 14, 15, -1, -1, 18, 154, + 155, -1, 22, 23, -1, -1, -1, 27, 28, -1, + -1, 31, -1, 33, 34, -1, -1, 37, -1, -1, + -1, -1, -1, -1, -1, 45, -1, -1, -1, -1, + -1, 51, -1, 53, -1, -1, -1, -1, -1, -1, + 60, 61, -1, -1, 64, -1, -1, -1, 68, 69, + -1, -1, 72, 73, -1, -1, 7, -1, -1, -1, + -1, 12, -1, -1, -1, 16, -1, 87, 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 100, -1, -1, 103, -1, 105, -1, 107, 108, -1, + -1, -1, -1, -1, 114, -1, -1, 48, 118, 119, + 120, 121, 122, 123, -1, 125, -1, 127, 59, -1, + -1, -1, -1, 133, -1, -1, -1, 137, 138, 139, + -1, 141, 142, -1, 144, 145, 42, 78, -1, -1, + -1, 82, 11, 84, 50, 155, -1, -1, -1, -1, + 19, -1, 21, 94, -1, -1, 62, 63, -1, 65, + -1, -1, -1, -1, -1, 71, -1, -1, -1, 110, + 111, -1, -1, -1, 43, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, -1, 92, 93, -1, 95, + 96, 97, -1, 99, -1, -1, -1, -1, -1, 140, + -1, 142, -1, -1, -1, 146, 75, 76, 77, 150, + 79, 80, -1, -1, 83, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 146 + -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, + 146 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1321,42 +1324,42 @@ static const yytype_uint8 yystos[] = 0, 1, 8, 13, 14, 15, 18, 22, 23, 27, 28, 31, 33, 34, 37, 45, 51, 53, 60, 61, 64, 68, 69, 72, 73, 87, 88, 100, 103, 105, - 107, 108, 114, 118, 119, 121, 122, 123, 125, 127, - 133, 137, 138, 139, 141, 142, 144, 145, 155, 169, - 170, 171, 172, 173, 178, 179, 180, 181, 185, 188, - 194, 199, 202, 205, 208, 215, 216, 224, 225, 154, - 52, 30, 52, 223, 52, 52, 46, 49, 113, 115, - 120, 124, 182, 183, 184, 6, 10, 17, 58, 85, - 98, 126, 203, 204, 9, 81, 85, 197, 198, 131, - 209, 203, 20, 24, 70, 104, 112, 116, 132, 136, - 190, 55, 57, 131, 174, 175, 131, 131, 131, 131, - 131, 213, 214, 131, 174, 221, 221, 131, 131, 220, - 131, 131, 52, 26, 55, 57, 174, 175, 131, 131, - 210, 189, 190, 131, 223, 5, 29, 44, 47, 102, - 128, 129, 206, 207, 11, 19, 21, 43, 75, 76, - 77, 79, 80, 83, 101, 186, 187, 175, 52, 219, - 219, 0, 171, 154, 174, 174, 32, 50, 67, 218, - 166, 131, 131, 131, 131, 52, 131, 184, 204, 52, - 52, 52, 198, 30, 27, 33, 36, 66, 89, 143, - 191, 192, 131, 131, 38, 39, 40, 41, 117, 130, - 134, 135, 200, 201, 171, 214, 174, 131, 195, 26, - 26, 195, 74, 165, 190, 223, 223, 223, 223, 223, - 223, 223, 207, 52, 52, 35, 52, 140, 222, 52, - 223, 223, 52, 223, 223, 52, 52, 187, 53, 109, - 211, 212, 52, 154, 7, 12, 16, 48, 59, 78, - 82, 84, 94, 110, 111, 140, 142, 146, 150, 176, - 177, 4, 54, 56, 131, 149, 217, 156, 157, 226, - 227, 131, 3, 25, 86, 91, 106, 148, 151, 193, - 192, 222, 222, 222, 222, 131, 52, 223, 223, 201, - 42, 50, 62, 63, 65, 71, 90, 92, 93, 95, - 96, 97, 99, 146, 196, 195, 195, 175, 131, 175, - 52, 212, 223, 52, 52, 52, 52, 52, 52, 177, - 165, 165, 122, 227, 228, 229, 231, 154, 195, 26, - 223, 223, 165, 154, 167, 229, 166, 174, 158, 230, - 165, 159, 232, 233, 223, 165, 167, 233, 154, 223, - 166, 160, 161, 162, 163, 164, 234, 235, 165, 165, - 165, 165, 165, 167, 235, 154, 223, 223, 223, 223, - 223, 154 + 107, 108, 114, 118, 119, 120, 121, 122, 123, 125, + 127, 133, 137, 138, 139, 141, 142, 144, 145, 155, + 169, 170, 171, 172, 173, 178, 179, 180, 181, 185, + 188, 194, 199, 202, 205, 208, 215, 216, 224, 225, + 154, 52, 30, 52, 223, 52, 52, 46, 49, 113, + 115, 120, 124, 182, 183, 184, 6, 10, 17, 58, + 85, 98, 126, 203, 204, 9, 81, 85, 197, 198, + 131, 209, 203, 20, 24, 70, 104, 112, 116, 132, + 136, 190, 55, 57, 131, 174, 175, 131, 131, 131, + 131, 131, 213, 214, 131, 174, 221, 221, 131, 131, + 220, 131, 131, 52, 26, 55, 57, 174, 175, 52, + 131, 131, 210, 189, 190, 131, 223, 5, 29, 44, + 47, 102, 128, 129, 206, 207, 11, 19, 21, 43, + 75, 76, 77, 79, 80, 83, 101, 186, 187, 175, + 52, 219, 219, 0, 171, 154, 174, 174, 32, 50, + 67, 218, 166, 131, 131, 131, 131, 52, 131, 184, + 204, 52, 52, 52, 198, 30, 27, 33, 36, 66, + 89, 143, 191, 192, 131, 131, 38, 39, 40, 41, + 117, 130, 134, 135, 200, 201, 171, 214, 174, 131, + 195, 26, 26, 195, 74, 165, 190, 223, 223, 223, + 223, 223, 223, 223, 207, 52, 52, 35, 52, 140, + 222, 52, 223, 223, 52, 223, 223, 52, 52, 187, + 53, 109, 211, 212, 52, 154, 7, 12, 16, 48, + 59, 78, 82, 84, 94, 110, 111, 140, 142, 146, + 150, 176, 177, 4, 54, 56, 131, 149, 217, 156, + 157, 226, 227, 131, 3, 25, 86, 91, 106, 148, + 151, 193, 192, 222, 222, 222, 222, 131, 52, 223, + 223, 201, 42, 50, 62, 63, 65, 71, 90, 92, + 93, 95, 96, 97, 99, 146, 196, 195, 195, 175, + 131, 175, 52, 212, 223, 52, 52, 52, 52, 52, + 52, 177, 165, 165, 122, 227, 228, 229, 231, 154, + 195, 26, 223, 223, 165, 154, 167, 229, 166, 174, + 158, 230, 165, 159, 232, 233, 223, 165, 167, 233, + 154, 223, 166, 160, 161, 162, 163, 164, 234, 235, + 165, 165, 165, 165, 165, 167, 235, 154, 223, 223, + 223, 223, 223, 154 }; #define yyerrok (yyerrstatus = 0) @@ -2427,27 +2430,34 @@ yyreduce: /* Line 1455 of yacc.c */ #line 447 "ntp_parser.y" - { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } + { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 60: /* Line 1455 of yacc.c */ #line 449 "ntp_parser.y" + { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } + break; + + case 61: + +/* Line 1455 of yacc.c */ +#line 451 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; - case 62: + case 63: /* Line 1455 of yacc.c */ -#line 455 "ntp_parser.y" +#line 457 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 63: + case 64: /* Line 1455 of yacc.c */ -#line 460 "ntp_parser.y" +#line 462 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2456,10 +2466,10 @@ yyreduce: } break; - case 64: + case 65: /* Line 1455 of yacc.c */ -#line 467 "ntp_parser.y" +#line 469 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2468,13 +2478,6 @@ yyreduce: } break; - case 65: - -/* Line 1455 of yacc.c */ -#line 477 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } - break; - case 66: /* Line 1455 of yacc.c */ @@ -2507,121 +2510,132 @@ yyreduce: /* Line 1455 of yacc.c */ #line 487 "ntp_parser.y" - { - (yyval.Attr_val) = NULL; - cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); - } + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 71: /* Line 1455 of yacc.c */ -#line 500 "ntp_parser.y" - { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } +#line 489 "ntp_parser.y" + { + (yyval.Attr_val) = NULL; + cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); + msyslog(LOG_WARNING, + "'crypto revoke %d' is deprecated, " + "please use 'revoke %d' instead.", + cfgt.auth.revoke, cfgt.auth.revoke); + } break; case 72: /* Line 1455 of yacc.c */ -#line 504 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 506 "ntp_parser.y" + { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; case 73: /* Line 1455 of yacc.c */ -#line 505 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 510 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 74: /* Line 1455 of yacc.c */ -#line 510 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } +#line 511 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 75: /* Line 1455 of yacc.c */ -#line 512 "ntp_parser.y" +#line 516 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 76: /* Line 1455 of yacc.c */ -#line 514 "ntp_parser.y" +#line 518 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 77: /* Line 1455 of yacc.c */ -#line 516 "ntp_parser.y" +#line 520 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 78: /* Line 1455 of yacc.c */ -#line 518 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 522 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 79: /* Line 1455 of yacc.c */ -#line 520 "ntp_parser.y" +#line 524 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 80: /* Line 1455 of yacc.c */ -#line 522 "ntp_parser.y" +#line 526 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 81: /* Line 1455 of yacc.c */ -#line 524 "ntp_parser.y" +#line 528 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 82: /* Line 1455 of yacc.c */ -#line 526 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } +#line 530 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 83: /* Line 1455 of yacc.c */ -#line 528 "ntp_parser.y" +#line 532 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 84: /* Line 1455 of yacc.c */ -#line 530 "ntp_parser.y" +#line 534 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 85: /* Line 1455 of yacc.c */ -#line 540 "ntp_parser.y" - { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } +#line 536 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 86: /* Line 1455 of yacc.c */ -#line 542 "ntp_parser.y" +#line 546 "ntp_parser.y" + { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } + break; + + case 87: + +/* Line 1455 of yacc.c */ +#line 548 "ntp_parser.y" { if (input_from_file) cfgt.stats_dir = (yyvsp[(2) - (2)].String); @@ -2632,34 +2646,34 @@ yyreduce: } break; - case 87: + case 88: /* Line 1455 of yacc.c */ -#line 551 "ntp_parser.y" +#line 557 "ntp_parser.y" { enqueue(cfgt.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Queue))); } break; - case 88: + case 89: /* Line 1455 of yacc.c */ -#line 558 "ntp_parser.y" +#line 564 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 89: + case 90: /* Line 1455 of yacc.c */ -#line 559 "ntp_parser.y" +#line 565 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 98: + case 99: /* Line 1455 of yacc.c */ -#line 575 "ntp_parser.y" +#line 581 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2668,10 +2682,10 @@ yyreduce: } break; - case 99: + case 100: /* Line 1455 of yacc.c */ -#line 582 "ntp_parser.y" +#line 588 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2680,10 +2694,10 @@ yyreduce: } break; - case 100: + case 101: /* Line 1455 of yacc.c */ -#line 592 "ntp_parser.y" +#line 598 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); @@ -2695,10 +2709,10 @@ yyreduce: } break; - case 101: + case 102: /* Line 1455 of yacc.c */ -#line 602 "ntp_parser.y" +#line 608 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); @@ -2709,10 +2723,10 @@ yyreduce: } break; - case 102: + case 103: /* Line 1455 of yacc.c */ -#line 611 "ntp_parser.y" +#line 617 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2723,10 +2737,10 @@ yyreduce: } break; - case 103: + case 104: /* Line 1455 of yacc.c */ -#line 620 "ntp_parser.y" +#line 626 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2737,53 +2751,53 @@ yyreduce: } break; - case 104: + case 105: /* Line 1455 of yacc.c */ -#line 628 "ntp_parser.y" +#line 634 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 105: + case 106: /* Line 1455 of yacc.c */ -#line 629 "ntp_parser.y" +#line 635 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 113: + case 114: /* Line 1455 of yacc.c */ -#line 649 "ntp_parser.y" +#line 655 "ntp_parser.y" { append_queue(cfgt.discard_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 114: + case 115: /* Line 1455 of yacc.c */ -#line 653 "ntp_parser.y" +#line 659 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 115: + case 116: /* Line 1455 of yacc.c */ -#line 658 "ntp_parser.y" +#line 664 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 116: + case 117: /* Line 1455 of yacc.c */ -#line 663 "ntp_parser.y" +#line 669 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2798,10 +2812,10 @@ yyreduce: } break; - case 117: + case 118: /* Line 1455 of yacc.c */ -#line 676 "ntp_parser.y" +#line 682 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2816,160 +2830,160 @@ yyreduce: } break; - case 118: + case 119: /* Line 1455 of yacc.c */ -#line 689 "ntp_parser.y" +#line 695 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Queue), ip_file->line_no)); } break; - case 119: + case 120: /* Line 1455 of yacc.c */ -#line 697 "ntp_parser.y" +#line 703 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 120: + case 121: /* Line 1455 of yacc.c */ -#line 699 "ntp_parser.y" +#line 705 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 135: - -/* Line 1455 of yacc.c */ -#line 721 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } - break; - case 136: /* Line 1455 of yacc.c */ -#line 723 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 727 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 137: /* Line 1455 of yacc.c */ -#line 727 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 729 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 138: /* Line 1455 of yacc.c */ -#line 728 "ntp_parser.y" +#line 733 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 139: /* Line 1455 of yacc.c */ -#line 729 "ntp_parser.y" +#line 734 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 140: /* Line 1455 of yacc.c */ -#line 738 "ntp_parser.y" - { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } +#line 735 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 141: /* Line 1455 of yacc.c */ -#line 743 "ntp_parser.y" - { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 744 "ntp_parser.y" + { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; case 142: /* Line 1455 of yacc.c */ -#line 745 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 749 "ntp_parser.y" + { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 143: /* Line 1455 of yacc.c */ -#line 749 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 751 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 144: /* Line 1455 of yacc.c */ -#line 750 "ntp_parser.y" +#line 755 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 145: /* Line 1455 of yacc.c */ -#line 751 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 756 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 146: /* Line 1455 of yacc.c */ -#line 752 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 757 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 147: /* Line 1455 of yacc.c */ -#line 753 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 758 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 148: /* Line 1455 of yacc.c */ -#line 754 "ntp_parser.y" +#line 759 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 149: /* Line 1455 of yacc.c */ -#line 755 "ntp_parser.y" +#line 760 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 150: /* Line 1455 of yacc.c */ -#line 756 "ntp_parser.y" +#line 761 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 151: /* Line 1455 of yacc.c */ -#line 765 "ntp_parser.y" - { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } +#line 762 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 152: /* Line 1455 of yacc.c */ -#line 767 "ntp_parser.y" - { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } +#line 771 "ntp_parser.y" + { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } break; case 153: /* Line 1455 of yacc.c */ -#line 772 "ntp_parser.y" +#line 773 "ntp_parser.y" + { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } + break; + + case 154: + +/* Line 1455 of yacc.c */ +#line 778 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2978,10 +2992,10 @@ yyreduce: } break; - case 154: + case 155: /* Line 1455 of yacc.c */ -#line 779 "ntp_parser.y" +#line 785 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2990,52 +3004,52 @@ yyreduce: } break; - case 155: - -/* Line 1455 of yacc.c */ -#line 788 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } - break; - case 156: /* Line 1455 of yacc.c */ -#line 789 "ntp_parser.y" +#line 794 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 157: /* Line 1455 of yacc.c */ -#line 790 "ntp_parser.y" +#line 795 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 158: /* Line 1455 of yacc.c */ -#line 791 "ntp_parser.y" +#line 796 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 159: /* Line 1455 of yacc.c */ -#line 792 "ntp_parser.y" +#line 797 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 160: /* Line 1455 of yacc.c */ -#line 793 "ntp_parser.y" +#line 798 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 161: /* Line 1455 of yacc.c */ -#line 795 "ntp_parser.y" +#line 799 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } + break; + + case 162: + +/* Line 1455 of yacc.c */ +#line 801 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -3046,80 +3060,80 @@ yyreduce: } break; - case 162: - -/* Line 1455 of yacc.c */ -#line 810 "ntp_parser.y" - { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } - break; - case 163: /* Line 1455 of yacc.c */ -#line 814 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 816 "ntp_parser.y" + { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } break; case 164: /* Line 1455 of yacc.c */ -#line 815 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 820 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 165: /* Line 1455 of yacc.c */ -#line 819 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 821 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 166: /* Line 1455 of yacc.c */ -#line 820 "ntp_parser.y" +#line 825 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 167: /* Line 1455 of yacc.c */ -#line 821 "ntp_parser.y" +#line 826 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 168: /* Line 1455 of yacc.c */ -#line 822 "ntp_parser.y" +#line 827 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 169: /* Line 1455 of yacc.c */ -#line 823 "ntp_parser.y" +#line 828 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 170: /* Line 1455 of yacc.c */ -#line 824 "ntp_parser.y" +#line 829 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 171: /* Line 1455 of yacc.c */ -#line 825 "ntp_parser.y" +#line 830 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } + break; + + case 172: + +/* Line 1455 of yacc.c */ +#line 831 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; - case 173: + case 174: /* Line 1455 of yacc.c */ -#line 836 "ntp_parser.y" +#line 842 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -3137,62 +3151,62 @@ yyreduce: } break; - case 174: + case 175: /* Line 1455 of yacc.c */ -#line 852 "ntp_parser.y" +#line 858 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); } break; - case 175: + case 176: /* Line 1455 of yacc.c */ -#line 858 "ntp_parser.y" +#line 864 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 176: + case 177: /* Line 1455 of yacc.c */ -#line 860 "ntp_parser.y" +#line 866 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; - case 177: + case 178: /* Line 1455 of yacc.c */ -#line 862 "ntp_parser.y" +#line 868 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 178: + case 179: /* Line 1455 of yacc.c */ -#line 864 "ntp_parser.y" +#line 870 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; - case 179: + case 180: /* Line 1455 of yacc.c */ -#line 866 "ntp_parser.y" +#line 872 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 180: + case 181: /* Line 1455 of yacc.c */ -#line 869 "ntp_parser.y" +#line 875 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 181: + case 182: /* Line 1455 of yacc.c */ -#line 871 "ntp_parser.y" +#line 877 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3204,24 +3218,24 @@ yyreduce: } break; - case 182: + case 183: /* Line 1455 of yacc.c */ -#line 882 "ntp_parser.y" +#line 888 "ntp_parser.y" { append_queue(cfgt.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 183: + case 184: /* Line 1455 of yacc.c */ -#line 884 "ntp_parser.y" +#line 890 "ntp_parser.y" { append_queue(cfgt.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 184: + case 185: /* Line 1455 of yacc.c */ -#line 886 "ntp_parser.y" +#line 892 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3233,123 +3247,123 @@ yyreduce: } break; - case 185: + case 186: /* Line 1455 of yacc.c */ -#line 896 "ntp_parser.y" +#line 902 "ntp_parser.y" { enqueue(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 186: + case 187: /* Line 1455 of yacc.c */ -#line 898 "ntp_parser.y" +#line 904 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (2)].Address_node), NULL)); } break; - case 187: + case 188: /* Line 1455 of yacc.c */ -#line 900 "ntp_parser.y" +#line 906 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 188: + case 189: /* Line 1455 of yacc.c */ -#line 902 "ntp_parser.y" +#line 908 "ntp_parser.y" { append_queue(cfgt.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 189: + case 190: /* Line 1455 of yacc.c */ -#line 904 "ntp_parser.y" +#line 910 "ntp_parser.y" { enqueue(cfgt.qos, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 190: + case 191: /* Line 1455 of yacc.c */ -#line 909 "ntp_parser.y" +#line 915 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 191: + case 192: /* Line 1455 of yacc.c */ -#line 911 "ntp_parser.y" +#line 917 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double))); enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); } break; - case 192: + case 193: /* Line 1455 of yacc.c */ -#line 914 "ntp_parser.y" +#line 920 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 193: + case 194: /* Line 1455 of yacc.c */ -#line 919 "ntp_parser.y" +#line 925 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } break; - case 194: + case 195: /* Line 1455 of yacc.c */ -#line 921 "ntp_parser.y" +#line 927 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 195: + case 196: /* Line 1455 of yacc.c */ -#line 926 "ntp_parser.y" +#line 932 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 196: + case 197: /* Line 1455 of yacc.c */ -#line 927 "ntp_parser.y" +#line 933 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 197: + case 198: /* Line 1455 of yacc.c */ -#line 931 "ntp_parser.y" +#line 937 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; - case 198: + case 199: /* Line 1455 of yacc.c */ -#line 932 "ntp_parser.y" +#line 938 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node)); } break; - case 199: + case 200: /* Line 1455 of yacc.c */ -#line 936 "ntp_parser.y" +#line 942 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 200: + case 201: /* Line 1455 of yacc.c */ -#line 937 "ntp_parser.y" +#line 943 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 201: + case 202: /* Line 1455 of yacc.c */ -#line 942 "ntp_parser.y" +#line 948 "ntp_parser.y" { char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = (yyvsp[(1) - (1)].String) + 1; @@ -3363,72 +3377,72 @@ yyreduce: } break; - case 202: + case 203: /* Line 1455 of yacc.c */ -#line 957 "ntp_parser.y" +#line 963 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer))); } break; - case 203: + case 204: /* Line 1455 of yacc.c */ -#line 962 "ntp_parser.y" +#line 968 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer))); } break; - case 213: + case 214: /* Line 1455 of yacc.c */ -#line 993 "ntp_parser.y" +#line 999 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 214: + case 215: /* Line 1455 of yacc.c */ -#line 994 "ntp_parser.y" +#line 1000 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 215: + case 216: /* Line 1455 of yacc.c */ -#line 998 "ntp_parser.y" +#line 1004 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 216: + case 217: /* Line 1455 of yacc.c */ -#line 999 "ntp_parser.y" +#line 1005 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 217: + case 218: /* Line 1455 of yacc.c */ -#line 1003 "ntp_parser.y" +#line 1009 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 218: + case 219: /* Line 1455 of yacc.c */ -#line 1004 "ntp_parser.y" +#line 1010 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 219: + case 220: /* Line 1455 of yacc.c */ -#line 1009 "ntp_parser.y" +#line 1015 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) { yyerror("Integer value is not boolean (0 or 1). Assuming 1"); @@ -3439,31 +3453,31 @@ yyreduce: } break; - case 220: + case 221: /* Line 1455 of yacc.c */ -#line 1017 "ntp_parser.y" +#line 1023 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 221: + case 222: /* Line 1455 of yacc.c */ -#line 1018 "ntp_parser.y" +#line 1024 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 222: + case 223: /* Line 1455 of yacc.c */ -#line 1022 "ntp_parser.y" +#line 1028 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 224: + case 225: /* Line 1455 of yacc.c */ -#line 1033 "ntp_parser.y" +#line 1039 "ntp_parser.y" { cfgt.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3472,150 +3486,150 @@ yyreduce: } break; - case 225: - -/* Line 1455 of yacc.c */ -#line 1047 "ntp_parser.y" - { old_config_style = 0; } - break; - case 226: /* Line 1455 of yacc.c */ -#line 1051 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } +#line 1053 "ntp_parser.y" + { old_config_style = 0; } break; case 227: /* Line 1455 of yacc.c */ -#line 1052 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } +#line 1057 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; case 228: /* Line 1455 of yacc.c */ -#line 1056 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1058 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; case 229: /* Line 1455 of yacc.c */ -#line 1057 "ntp_parser.y" +#line 1062 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 230: /* Line 1455 of yacc.c */ -#line 1061 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } +#line 1063 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 231: /* Line 1455 of yacc.c */ -#line 1062 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } +#line 1067 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; case 232: /* Line 1455 of yacc.c */ -#line 1067 "ntp_parser.y" - { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } +#line 1068 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; case 233: /* Line 1455 of yacc.c */ -#line 1071 "ntp_parser.y" - { (yyval.Double) = (yyvsp[(3) - (4)].Double); } +#line 1073 "ntp_parser.y" + { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } break; case 234: /* Line 1455 of yacc.c */ -#line 1075 "ntp_parser.y" - { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } +#line 1077 "ntp_parser.y" + { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; case 235: /* Line 1455 of yacc.c */ -#line 1079 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } +#line 1081 "ntp_parser.y" + { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; case 236: /* Line 1455 of yacc.c */ -#line 1080 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } +#line 1085 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; case 237: /* Line 1455 of yacc.c */ -#line 1085 "ntp_parser.y" - { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } +#line 1086 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; case 238: /* Line 1455 of yacc.c */ -#line 1089 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } +#line 1091 "ntp_parser.y" + { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; case 239: /* Line 1455 of yacc.c */ -#line 1090 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } +#line 1095 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; case 240: /* Line 1455 of yacc.c */ -#line 1095 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1096 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; case 241: /* Line 1455 of yacc.c */ -#line 1097 "ntp_parser.y" +#line 1101 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 242: /* Line 1455 of yacc.c */ -#line 1099 "ntp_parser.y" +#line 1103 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 243: /* Line 1455 of yacc.c */ -#line 1101 "ntp_parser.y" +#line 1105 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 244: /* Line 1455 of yacc.c */ -#line 1103 "ntp_parser.y" +#line 1107 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } + break; + + case 245: + +/* Line 1455 of yacc.c */ +#line 1109 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; /* Line 1455 of yacc.c */ -#line 3619 "ntp_parser.c" +#line 3633 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3827,7 +3841,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1107 "ntp_parser.y" +#line 1113 "ntp_parser.y" void yyerror (char *msg) diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y index c664429511..13ea0c66f7 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -443,6 +443,8 @@ authentication_command { cfgt.auth.keysdir = $2; } | T_Requestkey T_Integer { cfgt.auth.request_key = $2; } + | T_Revoke T_Integer + { cfgt.auth.revoke = $2; } | T_Trustedkey integer_list { cfgt.auth.trusted_key_list = $2; } | T_NtpSignDsocket T_String @@ -487,6 +489,10 @@ crypto_command { $$ = NULL; cfgt.auth.revoke = $2; + msyslog(LOG_WARNING, + "'crypto revoke %d' is deprecated, " + "please use 'revoke %d' instead.", + cfgt.auth.revoke, cfgt.auth.revoke); } ; diff --git a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj index 91bcf2ee94..cb0cff7fd0 100644 --- a/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj +++ b/ports/winnt/vs2008/ntp-keygen/ntp-keygen.vcproj @@ -77,7 +77,7 @@ />