From: Juergen Perlinger Date: Wed, 16 Nov 2016 21:14:26 +0000 (+0100) Subject: [Bug 2851] allow -4/-6 on restrict line with mask X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c272bf6ab2e452c1dbdab01aa9e623e90ff2c4;p=thirdparty%2Fntp.git [Bug 2851] allow -4/-6 on restrict line with mask bk: 582ccc32oAAx2xmrVktWzVSrxr0JGA --- diff --git a/ChangeLog b/ChangeLog index 0805467dc..82702a6ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +--- +* [Bug 2851] allow -4/-6 on restrict line with mask + - applied patch by Miroslav Lichvar for ntp4.2.6 compat + --- (4.2.8p8) 2016/06/02 Released by Harlan Stenn diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index c43269491..1ae673b82 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -806,9 +806,9 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 214 +#define YYFINAL 213 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 655 +#define YYLAST 657 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 203 @@ -817,7 +817,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 317 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 423 +#define YYNSTATES 422 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -1025,10 +1025,10 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -189 +#define YYPACT_NINF -188 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-189))) + (!!((Yystate) == (-188))) #define YYTABLE_NINF -7 @@ -1039,49 +1039,49 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - 20, -174, -32, -189, -189, -189, -29, -189, 315, 3, - -133, -189, 315, -189, 119, -48, -189, -126, -189, -118, - -115, -189, -189, -113, -189, -189, -48, -5, 374, -48, - -189, -189, -105, -189, -100, -189, -189, 1, 81, 46, - 2, -31, -189, -189, -90, 119, -88, -189, 148, 380, - -81, -53, 23, -189, -189, -189, 87, 207, -106, -189, - -48, -189, -48, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -9, 29, -62, -61, -189, -7, -189, - -189, -102, -189, -189, -189, 32, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, 315, -189, - -189, -189, -189, -189, -189, 3, -189, 42, 78, -189, - 315, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, 112, -189, -39, 367, -189, -189, -189, - -113, -189, -189, -48, -189, -189, -189, -189, -189, -189, - -189, -189, -189, 374, -189, 60, -48, -189, -189, -34, - -189, -189, -189, -189, -189, -189, -189, -189, 81, -189, - -189, 97, 102, -189, -189, 44, -189, -189, -189, -189, - -31, -189, 71, -63, -189, 119, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, 148, -189, - -9, -189, -189, -36, -189, -189, -189, -189, -189, -189, - -189, -189, 380, -189, 75, -9, -189, -189, 76, -53, - -189, -189, -189, 77, -189, -43, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, 0, -150, - -189, -189, -189, -189, -189, 89, -189, -6, -189, -189, - -189, -189, 39, 13, -189, -189, -189, -189, 15, 99, - -189, -189, 112, -189, -9, -36, -189, -189, -189, -189, - -189, -189, -189, -189, 475, -189, -189, 475, 475, -81, - -189, -189, 18, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -58, 144, -189, -189, -189, 353, -189, - -189, -189, -189, -189, -189, -189, -189, -96, -3, -13, - -189, -189, -189, -189, 27, -189, -189, 11, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, 475, 475, -189, 163, -81, 133, -189, - 141, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -52, -189, 45, 5, 19, -125, -189, 8, -189, -9, - -189, -189, -189, -189, -189, -189, -189, -189, -189, 475, - -189, -189, -189, -189, 14, -189, -189, -189, -48, -189, - -189, -189, 22, -189, -189, -189, 21, 24, -9, 36, - -164, -189, 33, -9, -189, -189, -189, 10, 69, -189, - -189, -189, -189, -189, 31, 48, 40, -189, 52, -189, - -9, -189, -189 + 20, -156, -28, -188, -188, -188, -23, -188, 282, -1, + -113, -188, 282, -188, 115, -48, -188, -108, -188, -107, + -105, -188, -188, -103, -188, -188, -48, -2, 257, -48, + -188, -188, -97, -188, -96, -188, -188, 10, 15, 90, + 12, -14, -188, -188, -83, 115, -82, -188, 91, 533, + -81, -53, 23, -188, -188, -188, 85, 190, -100, -188, + -48, -188, -48, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -20, 28, -69, -65, -188, -7, -188, + -188, -102, -188, -188, -188, 32, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, 282, -188, + -188, -188, -188, -188, -188, -1, -188, 41, 61, -188, + 282, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, 265, -188, -47, 360, -188, -188, -188, + -103, -188, -188, -48, -188, -188, -188, -188, -188, -188, + -188, -188, -188, 257, -188, 45, -48, -188, -188, -45, + -188, -188, -188, -188, -188, -188, -188, -188, 15, -188, + -188, 83, 88, -188, 33, -188, -188, -188, -188, -14, + -188, 59, -77, -188, 115, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, 91, -188, -20, + -188, -188, -36, -188, -188, -188, -188, -188, -188, -188, + -188, 533, -188, 64, -20, -188, -188, 68, -53, -188, + -188, -188, 69, -188, -55, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, 0, -176, -188, + -188, -188, -188, -188, 76, -188, -21, -188, -188, -188, + -188, 240, -11, -188, -188, -188, -188, -9, 92, -188, + -188, 265, -188, -20, -36, -188, -188, -188, -188, -188, + -188, -188, -188, 468, -188, -188, 468, -81, 468, -188, + -188, -5, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -58, 108, -188, -188, -188, 346, -188, -188, + -188, -188, -188, -188, -188, -188, -121, -32, -41, -188, + -188, -188, -188, 1, -188, -188, 11, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, 468, 468, -188, 145, -81, 113, -188, 117, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -50, + -188, 25, -19, 3, -138, -188, -16, -188, -20, -188, + -188, -188, -188, -188, -188, -188, -188, -188, 468, -188, + -188, -188, -188, -6, -188, -188, -188, -48, -188, -188, + -188, 4, -188, -188, -188, -12, 9, -20, 5, -163, + -188, 22, -20, -188, -188, -188, 13, 62, -188, -188, + -188, -188, -188, 40, 24, 18, -188, 34, -188, -20, + -188, -188 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1105,65 +1105,65 @@ static const yytype_uint16 yydefact[] = 230, 256, 289, 59, 61, 160, 161, 162, 163, 164, 165, 166, 167, 127, 158, 0, 60, 70, 287, 231, 67, 272, 273, 274, 275, 276, 277, 278, 269, 271, - 134, 29, 30, 134, 134, 26, 68, 188, 186, 187, - 182, 184, 0, 0, 232, 96, 100, 97, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 207, 209, - 0, 91, 86, 0, 87, 95, 93, 94, 92, 90, - 88, 89, 80, 82, 0, 0, 251, 283, 0, 69, - 282, 284, 280, 234, 1, 0, 4, 31, 55, 294, - 293, 223, 224, 225, 226, 268, 267, 266, 0, 0, - 79, 75, 76, 77, 78, 0, 72, 0, 191, 151, - 153, 246, 98, 0, 178, 179, 180, 181, 0, 0, - 176, 177, 168, 170, 0, 0, 27, 227, 255, 288, - 157, 159, 286, 270, 130, 134, 134, 133, 128, 0, - 183, 185, 0, 99, 208, 210, 292, 290, 291, 85, - 81, 83, 84, 233, 0, 281, 279, 3, 20, 262, - 263, 264, 259, 265, 258, 300, 301, 0, 0, 0, - 74, 73, 118, 117, 0, 115, 116, 0, 110, 113, - 114, 174, 175, 173, 169, 171, 172, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 135, 131, 132, 134, 250, 0, 0, 252, - 0, 37, 38, 39, 54, 47, 49, 48, 51, 40, - 41, 42, 43, 50, 52, 44, 32, 33, 36, 34, - 0, 35, 0, 0, 0, 0, 303, 0, 298, 0, - 111, 125, 121, 123, 119, 120, 122, 124, 112, 129, - 249, 248, 254, 253, 0, 45, 46, 53, 0, 297, - 295, 302, 0, 299, 285, 306, 0, 0, 0, 0, - 0, 308, 0, 0, 304, 307, 305, 0, 0, 313, - 314, 315, 316, 317, 0, 0, 0, 309, 0, 311, - 0, 310, 312 + 134, 29, 30, 134, 134, 68, 188, 186, 187, 182, + 184, 0, 0, 232, 96, 100, 97, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 207, 209, 0, + 91, 86, 0, 87, 95, 93, 94, 92, 90, 88, + 89, 80, 82, 0, 0, 251, 283, 0, 69, 282, + 284, 280, 234, 1, 0, 4, 31, 55, 294, 293, + 223, 224, 225, 226, 268, 267, 266, 0, 0, 79, + 75, 76, 77, 78, 0, 72, 0, 191, 151, 153, + 246, 98, 0, 178, 179, 180, 181, 0, 0, 176, + 177, 168, 170, 0, 0, 27, 227, 255, 288, 157, + 159, 286, 270, 130, 134, 134, 133, 0, 128, 183, + 185, 0, 99, 208, 210, 292, 290, 291, 85, 81, + 83, 84, 233, 0, 281, 279, 3, 20, 262, 263, + 264, 259, 265, 258, 300, 301, 0, 0, 0, 74, + 73, 118, 117, 0, 115, 116, 0, 110, 113, 114, + 174, 175, 173, 169, 171, 172, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 135, 131, 132, 134, 250, 0, 0, 252, 0, + 37, 38, 39, 54, 47, 49, 48, 51, 40, 41, + 42, 43, 50, 52, 44, 32, 33, 36, 34, 0, + 35, 0, 0, 0, 0, 303, 0, 298, 0, 111, + 125, 121, 123, 119, 120, 122, 124, 112, 129, 249, + 248, 254, 253, 0, 45, 46, 53, 0, 297, 295, + 302, 0, 299, 285, 306, 0, 0, 0, 0, 0, + 308, 0, 0, 304, 307, 305, 0, 0, 313, 314, + 315, 316, 317, 0, 0, 0, 309, 0, 311, 0, + 310, 312 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -189, -189, -189, -41, -189, -189, -15, -38, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, 16, -189, -189, -189, - -189, -35, -189, -189, -189, -189, -189, -189, -157, -189, - -189, 138, -189, -189, 106, -189, -189, -189, -2, -189, - -189, -189, -189, 83, -189, -189, 239, -79, -189, -189, - -189, -189, 66, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -189, -189, 126, -189, -189, -189, -189, - -189, -189, 101, -189, -189, 51, -189, -189, 242, 17, - -188, -189, -189, -189, -24, -189, -189, -97, -189, -189, - -189, -123, -189, -130, -189 + -188, -188, -188, -38, -188, -188, -15, -49, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, 21, -188, -188, -188, + -188, -29, -188, -188, -188, -188, -188, -188, -157, -188, + -188, 97, -188, -188, 81, -188, -188, -188, -25, -188, + -188, -188, -188, 60, -188, -188, 218, -66, -188, -188, + -188, -188, 51, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, 111, -188, -188, -188, -188, + -188, -188, 102, -188, -188, 55, -188, -188, 235, 19, + -187, -188, -188, -188, -24, -188, -188, -86, -188, -188, + -188, -132, -188, -134, -188 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 56, 57, 58, 59, 60, 132, 124, 125, 288, - 356, 357, 358, 359, 360, 361, 362, 61, 62, 63, - 64, 85, 236, 237, 65, 202, 203, 204, 205, 66, - 175, 119, 242, 308, 309, 310, 378, 67, 264, 332, - 105, 106, 107, 143, 144, 145, 68, 252, 253, 254, - 255, 69, 170, 171, 172, 70, 98, 99, 100, 101, - 71, 188, 189, 190, 72, 73, 74, 75, 76, 109, - 174, 381, 283, 339, 130, 131, 77, 78, 294, 228, - 79, 158, 159, 213, 209, 210, 211, 149, 133, 279, - 221, 80, 81, 297, 298, 299, 365, 366, 397, 367, - 400, 401, 414, 415, 416 + -1, 56, 57, 58, 59, 60, 132, 124, 125, 287, + 355, 356, 357, 358, 359, 360, 361, 61, 62, 63, + 64, 85, 235, 236, 65, 201, 202, 203, 204, 66, + 174, 119, 241, 307, 308, 309, 377, 67, 263, 331, + 105, 106, 107, 143, 144, 145, 68, 251, 252, 253, + 254, 69, 169, 170, 171, 70, 98, 99, 100, 101, + 71, 187, 188, 189, 72, 73, 74, 75, 76, 109, + 173, 380, 282, 338, 130, 131, 77, 78, 293, 227, + 79, 158, 159, 212, 208, 209, 210, 149, 133, 278, + 220, 80, 81, 296, 297, 298, 364, 365, 396, 366, + 399, 400, 413, 414, 415 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1171,142 +1171,142 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 123, 165, 275, 276, 337, 289, 267, 268, 207, 385, - 176, 167, 206, 82, 102, 371, 215, 282, 120, 238, - 121, 1, 363, 219, 164, 277, 108, 225, 399, 83, - 2, 238, 84, 126, 3, 4, 5, 372, 404, 295, - 296, 127, 6, 7, 128, 217, 129, 218, 226, 8, - 9, 363, 220, 10, 147, 11, 134, 12, 13, 148, - 230, 14, 150, 166, 168, 290, 315, 291, 302, 173, - 15, 177, 227, 160, 16, 338, 303, 390, 122, 304, - 17, 216, 18, 231, 212, 257, 232, 214, 151, 152, - 222, 19, 20, 295, 296, 21, 22, 223, 224, 229, - 23, 24, 103, 240, 25, 26, 153, 104, 333, 334, - 241, 122, 161, 27, 162, 243, 373, 305, 259, 169, - 256, 261, 386, 374, 265, 262, 28, 29, 30, 266, - 269, 259, 271, 31, 278, 272, 281, 284, 286, 111, - 273, 375, 32, 112, 287, 154, 208, 33, 306, 34, - 300, 35, 36, 301, 178, 244, 245, 246, 247, 292, - 313, 37, 38, 39, 40, 41, 42, 43, 44, 233, - 234, 45, 311, 46, 312, 155, 235, 336, 379, 179, - 340, 393, 47, 293, 368, 369, 370, 48, 49, 50, - 380, 51, 52, 376, 383, 163, 377, 180, 53, 54, - 181, 113, 384, 388, 387, 122, 389, -6, 55, 392, - 402, 408, 307, 396, 394, 407, 399, 2, 280, 398, - 406, 3, 4, 5, 409, 410, 411, 412, 413, 6, - 7, 335, 422, 417, 403, 419, 8, 9, 420, 421, - 10, 156, 11, 239, 12, 13, 157, 114, 14, 260, - 314, 110, 248, 270, 274, 115, 258, 15, 116, 263, - 285, 16, 409, 410, 411, 412, 413, 17, 391, 18, - 249, 146, 316, 364, 182, 250, 251, 405, 19, 20, - 117, 0, 21, 22, 418, 118, 0, 23, 24, 0, - 0, 25, 26, 0, 0, 0, 0, 0, 0, 382, - 27, 0, 183, 184, 185, 186, 0, 0, 0, 0, - 187, 0, 0, 28, 29, 30, 0, 0, 0, 0, - 31, 0, 0, 86, 0, 0, 0, 87, 0, 32, - 0, 0, 0, 88, 33, 0, 34, 0, 35, 36, - 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, - 39, 40, 41, 42, 43, 44, 0, 0, 45, 0, - 46, 0, 341, 0, 0, 0, 0, 0, 0, 47, - 342, 0, 0, 395, 48, 49, 50, 2, 51, 52, - 0, 3, 4, 5, 89, 53, 54, 0, 0, 6, - 7, 0, 0, 191, -6, 55, 8, 9, 0, 192, - 10, 193, 11, 0, 12, 13, 343, 344, 14, 0, - 0, 0, 0, 0, 0, 0, 0, 15, 90, 91, - 0, 16, 0, 345, 0, 0, 0, 17, 194, 18, - 135, 136, 137, 138, 0, 92, 0, 0, 19, 20, - 93, 0, 21, 22, 0, 346, 0, 23, 24, 0, - 0, 25, 26, 347, 0, 348, 0, 0, 0, 0, - 27, 139, 0, 140, 0, 141, 0, 94, 195, 349, - 196, 142, 0, 28, 29, 30, 197, 0, 198, 0, - 31, 199, 0, 0, 0, 0, 0, 350, 351, 32, - 95, 96, 97, 0, 33, 0, 34, 0, 35, 36, - 0, 0, 0, 200, 201, 0, 0, 0, 37, 38, - 39, 40, 41, 42, 43, 44, 0, 0, 45, 0, - 46, 0, 317, 352, 0, 353, 0, 0, 0, 47, - 318, 0, 0, 354, 48, 49, 50, 355, 51, 52, - 0, 0, 0, 0, 0, 53, 54, 0, 319, 320, - 0, 0, 321, 0, 0, 55, 0, 0, 322, 0, + 123, 205, 274, 275, 336, 288, 266, 268, 206, 362, + 102, 384, 218, 294, 295, 370, 175, 281, 120, 214, + 121, 1, 151, 152, 164, 276, 362, 224, 166, 398, + 2, 82, 237, 83, 3, 4, 5, 371, 84, 403, + 153, 219, 6, 7, 237, 216, 108, 217, 225, 8, + 9, 126, 127, 10, 128, 11, 129, 12, 13, 134, + 229, 14, 147, 148, 389, 289, 314, 290, 294, 295, + 15, 150, 226, 165, 16, 337, 172, 176, 122, 154, + 17, 167, 18, 230, 211, 213, 231, 215, 256, 221, + 222, 19, 20, 240, 223, 21, 22, 177, 103, 228, + 23, 24, 239, 104, 25, 26, 260, 332, 333, 155, + 264, 122, 255, 27, 261, 265, 372, 160, 258, 267, + 270, 271, 178, 373, 385, 280, 28, 29, 30, 283, + 285, 258, 286, 31, 277, 111, 168, 299, 300, 112, + 179, 374, 32, 180, 339, 272, 207, 33, 310, 34, + 311, 35, 36, 312, 335, 367, 161, 368, 162, 291, + 369, 37, 38, 39, 40, 41, 42, 43, 44, 232, + 233, 45, 379, 46, 382, 156, 234, 378, 383, 387, + 157, 392, 47, 292, 386, 391, 397, 48, 49, 50, + 388, 51, 52, 375, 393, 395, 376, 113, 53, 54, + 2, 398, 238, 402, 3, 4, 5, -6, 55, 405, + 401, 418, 6, 7, 407, 406, 419, 181, 334, 8, + 9, 420, 279, 10, 259, 11, 313, 12, 13, 269, + 110, 14, 421, 408, 409, 410, 411, 412, 273, 163, + 15, 257, 416, 114, 16, 182, 183, 184, 185, 122, + 17, 115, 18, 186, 116, 408, 409, 410, 411, 412, + 262, 19, 20, 284, 146, 21, 22, 404, 242, 301, + 23, 24, 363, 315, 25, 26, 117, 302, 390, 417, + 303, 118, 0, 27, 0, 0, 0, 381, 0, 0, + 86, 0, 0, 0, 87, 0, 28, 29, 30, 0, + 88, 0, 0, 31, 0, 0, 0, 0, 243, 244, + 245, 246, 32, 135, 136, 137, 138, 33, 304, 34, + 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, + 0, 37, 38, 39, 40, 41, 42, 43, 44, 0, + 0, 45, 0, 46, 139, 0, 140, 0, 141, 305, + 0, 89, 47, 0, 142, 340, 0, 48, 49, 50, + 0, 51, 52, 341, 0, 0, 0, 0, 53, 54, + 2, 0, 394, 0, 3, 4, 5, -6, 55, 0, + 0, 0, 6, 7, 0, 90, 91, 0, 0, 8, + 9, 0, 0, 10, 0, 11, 0, 12, 13, 342, + 343, 14, 92, 0, 0, 247, 0, 93, 0, 0, + 15, 0, 0, 306, 16, 0, 344, 0, 0, 0, + 17, 0, 18, 248, 0, 0, 0, 0, 249, 250, + 0, 19, 20, 0, 94, 21, 22, 0, 345, 0, + 23, 24, 0, 0, 25, 26, 346, 0, 347, 0, + 0, 0, 0, 27, 0, 0, 0, 95, 96, 97, + 0, 0, 348, 0, 0, 0, 28, 29, 30, 0, + 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, + 349, 350, 32, 0, 0, 0, 0, 33, 0, 34, + 0, 35, 36, 0, 0, 0, 0, 0, 0, 0, + 0, 37, 38, 39, 40, 41, 42, 43, 44, 0, + 0, 45, 0, 46, 0, 316, 351, 0, 352, 0, + 0, 0, 47, 317, 0, 0, 353, 48, 49, 50, + 354, 51, 52, 0, 0, 0, 0, 0, 53, 54, + 0, 318, 319, 0, 0, 320, 190, 0, 55, 0, + 0, 321, 191, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 322, 323, + 0, 193, 324, 325, 0, 326, 327, 328, 0, 329, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 323, 324, 0, 0, 325, - 326, 0, 327, 328, 329, 0, 330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 331 + 0, 194, 0, 195, 0, 0, 0, 0, 0, 196, + 0, 197, 0, 0, 198, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 330, 0, + 0, 0, 0, 0, 0, 0, 199, 200 }; static const yytype_int16 yycheck[] = { - 15, 39, 190, 39, 62, 5, 163, 164, 61, 61, - 45, 42, 50, 187, 11, 4, 57, 205, 66, 98, - 68, 1, 147, 32, 39, 61, 159, 34, 192, 61, - 10, 110, 61, 159, 14, 15, 16, 26, 202, 189, - 190, 159, 22, 23, 159, 60, 159, 62, 55, 29, - 30, 147, 61, 33, 159, 35, 61, 37, 38, 159, - 28, 41, 61, 61, 95, 65, 254, 67, 29, 159, - 50, 159, 79, 27, 54, 133, 37, 202, 159, 40, - 60, 187, 62, 51, 61, 126, 54, 0, 7, 8, - 61, 71, 72, 189, 190, 75, 76, 159, 159, 201, - 80, 81, 99, 61, 84, 85, 25, 104, 265, 266, - 32, 159, 66, 93, 68, 3, 105, 78, 133, 150, - 159, 61, 174, 112, 27, 159, 106, 107, 108, 27, - 86, 146, 61, 113, 170, 198, 61, 61, 61, 20, - 175, 130, 122, 24, 187, 64, 199, 127, 109, 129, - 61, 131, 132, 159, 6, 43, 44, 45, 46, 159, - 61, 141, 142, 143, 144, 145, 146, 147, 148, 137, - 138, 151, 159, 153, 159, 94, 144, 159, 335, 31, - 36, 369, 162, 183, 187, 198, 159, 167, 168, 169, - 27, 171, 172, 182, 61, 149, 185, 49, 178, 179, - 52, 82, 61, 198, 159, 159, 187, 187, 188, 201, - 398, 201, 173, 191, 200, 403, 192, 10, 202, 198, - 187, 14, 15, 16, 193, 194, 195, 196, 197, 22, - 23, 269, 420, 202, 198, 187, 29, 30, 198, 187, - 33, 160, 35, 105, 37, 38, 165, 128, 41, 143, - 252, 12, 140, 170, 188, 136, 130, 50, 139, 158, - 209, 54, 193, 194, 195, 196, 197, 60, 365, 62, - 158, 29, 255, 297, 126, 163, 164, 400, 71, 72, - 161, -1, 75, 76, 414, 166, -1, 80, 81, -1, - -1, 84, 85, -1, -1, -1, -1, -1, -1, 337, - 93, -1, 154, 155, 156, 157, -1, -1, -1, -1, - 162, -1, -1, 106, 107, 108, -1, -1, -1, -1, - 113, -1, -1, 8, -1, -1, -1, 12, -1, 122, - -1, -1, -1, 18, 127, -1, 129, -1, 131, 132, - -1, -1, -1, -1, -1, -1, -1, -1, 141, 142, - 143, 144, 145, 146, 147, 148, -1, -1, 151, -1, - 153, -1, 9, -1, -1, -1, -1, -1, -1, 162, - 17, -1, -1, 388, 167, 168, 169, 10, 171, 172, - -1, 14, 15, 16, 69, 178, 179, -1, -1, 22, - 23, -1, -1, 13, 187, 188, 29, 30, -1, 19, - 33, 21, 35, -1, 37, 38, 53, 54, 41, -1, - -1, -1, -1, -1, -1, -1, -1, 50, 103, 104, - -1, 54, -1, 70, -1, -1, -1, 60, 48, 62, - 56, 57, 58, 59, -1, 120, -1, -1, 71, 72, - 125, -1, 75, 76, -1, 92, -1, 80, 81, -1, - -1, 84, 85, 100, -1, 102, -1, -1, -1, -1, - 93, 87, -1, 89, -1, 91, -1, 152, 88, 116, - 90, 97, -1, 106, 107, 108, 96, -1, 98, -1, - 113, 101, -1, -1, -1, -1, -1, 134, 135, 122, - 175, 176, 177, -1, 127, -1, 129, -1, 131, 132, - -1, -1, -1, 123, 124, -1, -1, -1, 141, 142, - 143, 144, 145, 146, 147, 148, -1, -1, 151, -1, - 153, -1, 47, 170, -1, 172, -1, -1, -1, 162, - 55, -1, -1, 180, 167, 168, 169, 184, 171, 172, - -1, -1, -1, -1, -1, 178, 179, -1, 73, 74, - -1, -1, 77, -1, -1, 188, -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, 110, 111, -1, -1, 114, - 115, -1, 117, 118, 119, -1, 121, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 15, 50, 189, 39, 62, 5, 163, 164, 61, 147, + 11, 61, 32, 189, 190, 4, 45, 204, 66, 57, + 68, 1, 7, 8, 39, 61, 147, 34, 42, 192, + 10, 187, 98, 61, 14, 15, 16, 26, 61, 202, + 25, 61, 22, 23, 110, 60, 159, 62, 55, 29, + 30, 159, 159, 33, 159, 35, 159, 37, 38, 61, + 28, 41, 159, 159, 202, 65, 253, 67, 189, 190, + 50, 61, 79, 61, 54, 133, 159, 159, 159, 64, + 60, 95, 62, 51, 61, 0, 54, 187, 126, 61, + 159, 71, 72, 32, 159, 75, 76, 6, 99, 201, + 80, 81, 61, 104, 84, 85, 61, 264, 265, 94, + 27, 159, 159, 93, 159, 27, 105, 27, 133, 86, + 61, 198, 31, 112, 174, 61, 106, 107, 108, 61, + 61, 146, 187, 113, 170, 20, 150, 61, 159, 24, + 49, 130, 122, 52, 36, 174, 199, 127, 159, 129, + 159, 131, 132, 61, 159, 187, 66, 198, 68, 159, + 159, 141, 142, 143, 144, 145, 146, 147, 148, 137, + 138, 151, 27, 153, 61, 160, 144, 334, 61, 198, + 165, 368, 162, 183, 159, 201, 198, 167, 168, 169, + 187, 171, 172, 182, 200, 191, 185, 82, 178, 179, + 10, 192, 105, 198, 14, 15, 16, 187, 188, 187, + 397, 187, 22, 23, 201, 402, 198, 126, 267, 29, + 30, 187, 201, 33, 143, 35, 251, 37, 38, 169, + 12, 41, 419, 193, 194, 195, 196, 197, 187, 149, + 50, 130, 202, 128, 54, 154, 155, 156, 157, 159, + 60, 136, 62, 162, 139, 193, 194, 195, 196, 197, + 158, 71, 72, 208, 29, 75, 76, 399, 3, 29, + 80, 81, 296, 254, 84, 85, 161, 37, 364, 413, + 40, 166, -1, 93, -1, -1, -1, 336, -1, -1, + 8, -1, -1, -1, 12, -1, 106, 107, 108, -1, + 18, -1, -1, 113, -1, -1, -1, -1, 43, 44, + 45, 46, 122, 56, 57, 58, 59, 127, 78, 129, + -1, 131, 132, -1, -1, -1, -1, -1, -1, -1, + -1, 141, 142, 143, 144, 145, 146, 147, 148, -1, + -1, 151, -1, 153, 87, -1, 89, -1, 91, 109, + -1, 69, 162, -1, 97, 9, -1, 167, 168, 169, + -1, 171, 172, 17, -1, -1, -1, -1, 178, 179, + 10, -1, 387, -1, 14, 15, 16, 187, 188, -1, + -1, -1, 22, 23, -1, 103, 104, -1, -1, 29, + 30, -1, -1, 33, -1, 35, -1, 37, 38, 53, + 54, 41, 120, -1, -1, 140, -1, 125, -1, -1, + 50, -1, -1, 173, 54, -1, 70, -1, -1, -1, + 60, -1, 62, 158, -1, -1, -1, -1, 163, 164, + -1, 71, 72, -1, 152, 75, 76, -1, 92, -1, + 80, 81, -1, -1, 84, 85, 100, -1, 102, -1, + -1, -1, -1, 93, -1, -1, -1, 175, 176, 177, + -1, -1, 116, -1, -1, -1, 106, 107, 108, -1, + -1, -1, -1, 113, -1, -1, -1, -1, -1, -1, + 134, 135, 122, -1, -1, -1, -1, 127, -1, 129, + -1, 131, 132, -1, -1, -1, -1, -1, -1, -1, + -1, 141, 142, 143, 144, 145, 146, 147, 148, -1, + -1, 151, -1, 153, -1, 47, 170, -1, 172, -1, + -1, -1, 162, 55, -1, -1, 180, 167, 168, 169, + 184, 171, 172, -1, -1, -1, -1, -1, 178, 179, + -1, 73, 74, -1, -1, 77, 13, -1, 188, -1, + -1, 83, 19, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 110, 111, + -1, 48, 114, 115, -1, 117, 118, 119, -1, 121, -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, 180 + -1, 88, -1, 90, -1, -1, -1, -1, -1, 96, + -1, 98, -1, -1, 101, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 180, -1, + -1, -1, -1, -1, -1, -1, 123, 124 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1329,33 +1329,33 @@ static const yytype_uint16 yystos[] = 277, 278, 209, 291, 61, 56, 57, 58, 59, 87, 89, 91, 97, 246, 247, 248, 291, 159, 159, 290, 61, 7, 8, 25, 64, 94, 160, 165, 284, 285, - 27, 66, 68, 149, 209, 210, 61, 42, 95, 150, - 255, 256, 257, 159, 273, 233, 234, 159, 6, 31, - 49, 52, 126, 154, 155, 156, 157, 162, 264, 265, - 266, 13, 19, 21, 48, 88, 90, 96, 98, 101, - 123, 124, 228, 229, 230, 231, 210, 61, 199, 287, - 288, 289, 61, 286, 0, 206, 187, 209, 209, 32, - 61, 293, 61, 159, 159, 34, 55, 79, 282, 201, - 28, 51, 54, 137, 138, 144, 225, 226, 260, 244, - 61, 32, 235, 3, 43, 44, 45, 46, 140, 158, - 163, 164, 250, 251, 252, 253, 159, 206, 278, 209, - 247, 61, 159, 285, 241, 27, 27, 241, 241, 86, - 256, 61, 198, 234, 265, 293, 39, 61, 170, 292, - 229, 61, 293, 275, 61, 288, 61, 187, 212, 5, - 65, 67, 159, 183, 281, 189, 190, 296, 297, 298, - 61, 159, 29, 37, 40, 78, 109, 173, 236, 237, - 238, 159, 159, 61, 251, 293, 292, 47, 55, 73, - 74, 77, 83, 110, 111, 114, 115, 117, 118, 119, - 121, 180, 242, 241, 241, 210, 159, 62, 133, 276, - 36, 9, 17, 53, 54, 70, 92, 100, 102, 116, - 134, 135, 170, 172, 180, 184, 213, 214, 215, 216, - 217, 218, 219, 147, 297, 299, 300, 302, 187, 198, - 159, 4, 26, 105, 112, 130, 182, 185, 239, 241, - 27, 274, 210, 61, 61, 61, 174, 159, 198, 187, - 202, 300, 201, 293, 200, 209, 191, 301, 198, 192, - 303, 304, 293, 198, 202, 304, 187, 293, 201, 193, - 194, 195, 196, 197, 305, 306, 307, 202, 306, 187, - 198, 187, 293 + 27, 66, 68, 149, 209, 61, 42, 95, 150, 255, + 256, 257, 159, 273, 233, 234, 159, 6, 31, 49, + 52, 126, 154, 155, 156, 157, 162, 264, 265, 266, + 13, 19, 21, 48, 88, 90, 96, 98, 101, 123, + 124, 228, 229, 230, 231, 210, 61, 199, 287, 288, + 289, 61, 286, 0, 206, 187, 209, 209, 32, 61, + 293, 61, 159, 159, 34, 55, 79, 282, 201, 28, + 51, 54, 137, 138, 144, 225, 226, 260, 244, 61, + 32, 235, 3, 43, 44, 45, 46, 140, 158, 163, + 164, 250, 251, 252, 253, 159, 206, 278, 209, 247, + 61, 159, 285, 241, 27, 27, 241, 86, 241, 256, + 61, 198, 234, 265, 293, 39, 61, 170, 292, 229, + 61, 293, 275, 61, 288, 61, 187, 212, 5, 65, + 67, 159, 183, 281, 189, 190, 296, 297, 298, 61, + 159, 29, 37, 40, 78, 109, 173, 236, 237, 238, + 159, 159, 61, 251, 293, 292, 47, 55, 73, 74, + 77, 83, 110, 111, 114, 115, 117, 118, 119, 121, + 180, 242, 241, 241, 210, 159, 62, 133, 276, 36, + 9, 17, 53, 54, 70, 92, 100, 102, 116, 134, + 135, 170, 172, 180, 184, 213, 214, 215, 216, 217, + 218, 219, 147, 297, 299, 300, 302, 187, 198, 159, + 4, 26, 105, 112, 130, 182, 185, 239, 241, 27, + 274, 210, 61, 61, 61, 174, 159, 198, 187, 202, + 300, 201, 293, 200, 209, 191, 301, 198, 192, 303, + 304, 293, 198, 202, 304, 187, 293, 201, 193, 194, + 195, 196, 197, 305, 306, 307, 202, 306, 187, 198, + 187, 293 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y index fcd77a195..bc7c71335 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -801,7 +801,7 @@ access_control_command lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } - | T_Restrict ip_address T_Mask ip_address ac_flag_list + | T_Restrict address T_Mask ip_address ac_flag_list { restrict_node *rn;