From: Dave Hart Date: Tue, 29 Sep 2009 06:38:31 +0000 (+0000) Subject: Remove "tos maxhop" ntp.conf knob. X-Git-Tag: NTP_4_2_5P224~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d81a41db5ec21693bc8caeedead6c4a0c313fed6;p=thirdparty%2Fntp.git Remove "tos maxhop" ntp.conf knob. bk: 4ac1ab678SnOfnNQA9aYirJSt48kOA --- diff --git a/ChangeLog b/ChangeLog index 34f51daa3..84bb82e22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ * Clockhop and documentation fixes from Dave Mills. +* Remove "tos maxhop" ntp.conf knob. (4.2.5p223) 2009/09/28 Released by Harlan Stenn * [Bug 1321] build doesn't work if . isn't on $PATH. * [Bug 1323] Implement "revoke #" to match documentation, deprecate diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index 588eeda19..fda0817bf 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -204,94 +204,93 @@ T_Mask = 329, T_Maxclock = 330, T_Maxdist = 331, - T_Maxhop = 332, - T_Maxpoll = 333, - T_Minclock = 334, - T_Mindist = 335, - T_Minimum = 336, - T_Minpoll = 337, - T_Minsane = 338, - T_Mode = 339, - T_Monitor = 340, - T_Month = 341, - T_Multicastclient = 342, - T_Nic = 343, - T_Nolink = 344, - T_Nomodify = 345, - T_None = 346, - T_Nopeer = 347, - T_Noquery = 348, - T_Noselect = 349, - T_Noserve = 350, - T_Notrap = 351, - T_Notrust = 352, - T_Ntp = 353, - T_Ntpport = 354, - T_NtpSignDsocket = 355, - T_Orphan = 356, - T_Panic = 357, - T_Peer = 358, - T_Peerstats = 359, - T_Phone = 360, - T_Pid = 361, - T_Pidfile = 362, - T_Pool = 363, - T_Port = 364, - T_Preempt = 365, - T_Prefer = 366, - T_Protostats = 367, - T_Pw = 368, - T_Qos = 369, - T_Randfile = 370, - T_Rawstats = 371, - T_Refid = 372, - T_Requestkey = 373, - T_Restrict = 374, - T_Revoke = 375, - T_Saveconfigdir = 376, - T_Server = 377, - T_Setvar = 378, - T_Sign = 379, - T_Statistics = 380, - T_Stats = 381, - T_Statsdir = 382, - T_Step = 383, - T_Stepout = 384, - T_Stratum = 385, - T_String = 386, - T_Sysstats = 387, - T_Tick = 388, - T_Time1 = 389, - T_Time2 = 390, - T_Timingstats = 391, - T_Tinker = 392, - T_Tos = 393, - T_Trap = 394, - T_True = 395, - T_Trustedkey = 396, - T_Ttl = 397, - T_Type = 398, - T_Unconfig = 399, - T_Unpeer = 400, - T_Version = 401, - T_WanderThreshold = 402, - T_Week = 403, - T_Wildcard = 404, - T_Xleave = 405, - T_Year = 406, - T_Flag = 407, - T_Void = 408, - T_EOC = 409, - T_Simulate = 410, - T_Beep_Delay = 411, - T_Sim_Duration = 412, - T_Server_Offset = 413, - T_Duration = 414, - T_Freq_Offset = 415, - T_Wander = 416, - T_Jitter = 417, - T_Prop_Delay = 418, - T_Proc_Delay = 419 + T_Maxpoll = 332, + T_Minclock = 333, + T_Mindist = 334, + T_Minimum = 335, + T_Minpoll = 336, + T_Minsane = 337, + T_Mode = 338, + T_Monitor = 339, + T_Month = 340, + T_Multicastclient = 341, + T_Nic = 342, + T_Nolink = 343, + T_Nomodify = 344, + T_None = 345, + T_Nopeer = 346, + T_Noquery = 347, + T_Noselect = 348, + T_Noserve = 349, + T_Notrap = 350, + T_Notrust = 351, + T_Ntp = 352, + T_Ntpport = 353, + T_NtpSignDsocket = 354, + T_Orphan = 355, + T_Panic = 356, + T_Peer = 357, + T_Peerstats = 358, + T_Phone = 359, + T_Pid = 360, + T_Pidfile = 361, + T_Pool = 362, + T_Port = 363, + T_Preempt = 364, + T_Prefer = 365, + T_Protostats = 366, + T_Pw = 367, + T_Qos = 368, + T_Randfile = 369, + T_Rawstats = 370, + T_Refid = 371, + T_Requestkey = 372, + T_Restrict = 373, + T_Revoke = 374, + T_Saveconfigdir = 375, + T_Server = 376, + T_Setvar = 377, + T_Sign = 378, + T_Statistics = 379, + T_Stats = 380, + T_Statsdir = 381, + T_Step = 382, + T_Stepout = 383, + T_Stratum = 384, + T_String = 385, + T_Sysstats = 386, + T_Tick = 387, + T_Time1 = 388, + T_Time2 = 389, + T_Timingstats = 390, + T_Tinker = 391, + T_Tos = 392, + T_Trap = 393, + T_True = 394, + T_Trustedkey = 395, + T_Ttl = 396, + T_Type = 397, + T_Unconfig = 398, + T_Unpeer = 399, + T_Version = 400, + T_WanderThreshold = 401, + T_Week = 402, + T_Wildcard = 403, + T_Xleave = 404, + T_Year = 405, + T_Flag = 406, + T_Void = 407, + T_EOC = 408, + T_Simulate = 409, + T_Beep_Delay = 410, + T_Sim_Duration = 411, + T_Server_Offset = 412, + T_Duration = 413, + T_Freq_Offset = 414, + T_Wander = 415, + T_Jitter = 416, + T_Prop_Delay = 417, + T_Proc_Delay = 418 }; #endif /* Tokens. */ @@ -369,94 +368,93 @@ #define T_Mask 329 #define T_Maxclock 330 #define T_Maxdist 331 -#define T_Maxhop 332 -#define T_Maxpoll 333 -#define T_Minclock 334 -#define T_Mindist 335 -#define T_Minimum 336 -#define T_Minpoll 337 -#define T_Minsane 338 -#define T_Mode 339 -#define T_Monitor 340 -#define T_Month 341 -#define T_Multicastclient 342 -#define T_Nic 343 -#define T_Nolink 344 -#define T_Nomodify 345 -#define T_None 346 -#define T_Nopeer 347 -#define T_Noquery 348 -#define T_Noselect 349 -#define T_Noserve 350 -#define T_Notrap 351 -#define T_Notrust 352 -#define T_Ntp 353 -#define T_Ntpport 354 -#define T_NtpSignDsocket 355 -#define T_Orphan 356 -#define T_Panic 357 -#define T_Peer 358 -#define T_Peerstats 359 -#define T_Phone 360 -#define T_Pid 361 -#define T_Pidfile 362 -#define T_Pool 363 -#define T_Port 364 -#define T_Preempt 365 -#define T_Prefer 366 -#define T_Protostats 367 -#define T_Pw 368 -#define T_Qos 369 -#define T_Randfile 370 -#define T_Rawstats 371 -#define T_Refid 372 -#define T_Requestkey 373 -#define T_Restrict 374 -#define T_Revoke 375 -#define T_Saveconfigdir 376 -#define T_Server 377 -#define T_Setvar 378 -#define T_Sign 379 -#define T_Statistics 380 -#define T_Stats 381 -#define T_Statsdir 382 -#define T_Step 383 -#define T_Stepout 384 -#define T_Stratum 385 -#define T_String 386 -#define T_Sysstats 387 -#define T_Tick 388 -#define T_Time1 389 -#define T_Time2 390 -#define T_Timingstats 391 -#define T_Tinker 392 -#define T_Tos 393 -#define T_Trap 394 -#define T_True 395 -#define T_Trustedkey 396 -#define T_Ttl 397 -#define T_Type 398 -#define T_Unconfig 399 -#define T_Unpeer 400 -#define T_Version 401 -#define T_WanderThreshold 402 -#define T_Week 403 -#define T_Wildcard 404 -#define T_Xleave 405 -#define T_Year 406 -#define T_Flag 407 -#define T_Void 408 -#define T_EOC 409 -#define T_Simulate 410 -#define T_Beep_Delay 411 -#define T_Sim_Duration 412 -#define T_Server_Offset 413 -#define T_Duration 414 -#define T_Freq_Offset 415 -#define T_Wander 416 -#define T_Jitter 417 -#define T_Prop_Delay 418 -#define T_Proc_Delay 419 +#define T_Maxpoll 332 +#define T_Minclock 333 +#define T_Mindist 334 +#define T_Minimum 335 +#define T_Minpoll 336 +#define T_Minsane 337 +#define T_Mode 338 +#define T_Monitor 339 +#define T_Month 340 +#define T_Multicastclient 341 +#define T_Nic 342 +#define T_Nolink 343 +#define T_Nomodify 344 +#define T_None 345 +#define T_Nopeer 346 +#define T_Noquery 347 +#define T_Noselect 348 +#define T_Noserve 349 +#define T_Notrap 350 +#define T_Notrust 351 +#define T_Ntp 352 +#define T_Ntpport 353 +#define T_NtpSignDsocket 354 +#define T_Orphan 355 +#define T_Panic 356 +#define T_Peer 357 +#define T_Peerstats 358 +#define T_Phone 359 +#define T_Pid 360 +#define T_Pidfile 361 +#define T_Pool 362 +#define T_Port 363 +#define T_Preempt 364 +#define T_Prefer 365 +#define T_Protostats 366 +#define T_Pw 367 +#define T_Qos 368 +#define T_Randfile 369 +#define T_Rawstats 370 +#define T_Refid 371 +#define T_Requestkey 372 +#define T_Restrict 373 +#define T_Revoke 374 +#define T_Saveconfigdir 375 +#define T_Server 376 +#define T_Setvar 377 +#define T_Sign 378 +#define T_Statistics 379 +#define T_Stats 380 +#define T_Statsdir 381 +#define T_Step 382 +#define T_Stepout 383 +#define T_Stratum 384 +#define T_String 385 +#define T_Sysstats 386 +#define T_Tick 387 +#define T_Time1 388 +#define T_Time2 389 +#define T_Timingstats 390 +#define T_Tinker 391 +#define T_Tos 392 +#define T_Trap 393 +#define T_True 394 +#define T_Trustedkey 395 +#define T_Ttl 396 +#define T_Type 397 +#define T_Unconfig 398 +#define T_Unpeer 399 +#define T_Version 400 +#define T_WanderThreshold 401 +#define T_Week 402 +#define T_Wildcard 403 +#define T_Xleave 404 +#define T_Year 405 +#define T_Flag 406 +#define T_Void 407 +#define T_EOC 408 +#define T_Simulate 409 +#define T_Beep_Delay 410 +#define T_Sim_Duration 411 +#define T_Server_Offset 412 +#define T_Duration 413 +#define T_Freq_Offset 414 +#define T_Wander 415 +#define T_Jitter 416 +#define T_Prop_Delay 417 +#define T_Proc_Delay 418 @@ -484,7 +482,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 488 "ntp_parser.c" +#line 486 "ntp_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -496,7 +494,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 500 "ntp_parser.c" +#line 498 "ntp_parser.c" #ifdef short # undef short @@ -709,22 +707,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 173 +#define YYFINAL 172 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 660 +#define YYLAST 649 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 168 +#define YYNTOKENS 167 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 68 /* YYNRULES -- Number of rules. */ -#define YYNRULES 245 +#define YYNRULES 244 /* YYNRULES -- Number of states. */ -#define YYNSTATES 384 +#define YYNSTATES 382 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 419 +#define YYMAXUTOK 418 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -738,13 +736,13 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 165, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 164, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 166, 2, 167, 2, 2, 2, 2, + 2, 2, 2, 165, 2, 166, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -773,7 +771,7 @@ static const yytype_uint8 yytranslate[] = 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164 + 155, 156, 157, 158, 159, 160, 161, 162, 163 }; #if YYDEBUG @@ -789,125 +787,124 @@ static const yytype_uint16 yyprhs[] = 116, 118, 121, 124, 127, 130, 133, 136, 139, 142, 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 + 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 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 169, 0, -1, 170, -1, 170, 171, 154, -1, 171, - 154, -1, 1, 154, -1, -1, 172, -1, 178, -1, - 180, -1, 181, -1, 188, -1, 194, -1, 185, -1, - 199, -1, 202, -1, 205, -1, 208, -1, 224, -1, - 173, 174, 176, -1, 173, 174, -1, 122, -1, 108, - -1, 103, -1, 13, -1, 72, -1, 175, -1, 55, - 131, -1, 57, 131, -1, 131, -1, 176, 177, -1, - 177, -1, 7, -1, 12, 223, -1, 16, -1, 48, - -1, 59, 52, -1, 82, 52, -1, 78, 52, -1, - 94, -1, 110, -1, 111, -1, 140, -1, 150, -1, - 142, 52, -1, 84, 52, -1, 146, 52, -1, 179, - 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, 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 + 168, 0, -1, 169, -1, 169, 170, 153, -1, 170, + 153, -1, 1, 153, -1, -1, 171, -1, 177, -1, + 179, -1, 180, -1, 187, -1, 193, -1, 184, -1, + 198, -1, 201, -1, 204, -1, 207, -1, 223, -1, + 172, 173, 175, -1, 172, 173, -1, 121, -1, 107, + -1, 102, -1, 13, -1, 72, -1, 174, -1, 55, + 130, -1, 57, 130, -1, 130, -1, 175, 176, -1, + 176, -1, 7, -1, 12, 222, -1, 16, -1, 48, + -1, 59, 52, -1, 81, 52, -1, 77, 52, -1, + 93, -1, 109, -1, 110, -1, 139, -1, 149, -1, + 141, 52, -1, 83, 52, -1, 145, 52, -1, 178, + 173, -1, 143, -1, 144, -1, 14, -1, 73, 220, + -1, 86, 220, -1, 8, 52, -1, 22, 52, -1, + 23, 181, -1, 60, 130, -1, 61, 130, -1, 117, + 52, -1, 119, 52, -1, 140, 218, -1, 99, 130, + -1, 182, -1, -1, 182, 183, -1, 183, -1, 46, + 130, -1, 49, 130, -1, 112, 130, -1, 114, 130, + -1, 123, 130, -1, 119, 52, -1, 137, 185, -1, + 185, 186, -1, 186, -1, 19, 52, -1, 43, 52, + -1, 21, 221, -1, 100, 52, -1, 79, 222, -1, + 76, 222, -1, 78, 222, -1, 75, 222, -1, 82, + 52, -1, 11, 52, -1, 124, 188, -1, 126, 130, + -1, 37, 189, 190, -1, 188, 189, -1, 189, -1, + 20, -1, 24, -1, 70, -1, 103, -1, 115, -1, + 131, -1, 135, -1, 111, -1, 190, 191, -1, 191, + -1, 36, 130, -1, 142, 192, -1, 66, -1, 88, + -1, 33, -1, 27, -1, 90, -1, 105, -1, 25, + -1, 147, -1, 85, -1, 150, -1, 3, -1, 28, + 196, -1, 118, 173, 194, -1, 118, 26, 194, -1, + 118, 55, 26, 194, -1, 118, 57, 26, 194, -1, + 118, 174, 74, 174, 194, -1, -1, 194, 195, -1, + 42, -1, 50, -1, 62, -1, 63, -1, 65, -1, + 71, -1, 89, -1, 91, -1, 92, -1, 94, -1, + 95, -1, 96, -1, 98, -1, 145, -1, 196, 197, + -1, 197, -1, 9, 52, -1, 80, 52, -1, 84, + 52, -1, 45, 173, 199, -1, 199, 200, -1, 200, + -1, 133, 222, -1, 134, 222, -1, 129, 52, -1, + 116, 130, -1, 38, 221, -1, 39, 221, -1, 40, + 221, -1, 41, 221, -1, 33, 202, -1, 27, 202, + -1, 202, 203, -1, 203, -1, 6, -1, 10, -1, + 17, -1, 58, -1, 84, -1, 97, -1, 125, -1, + 136, 205, -1, 205, 206, -1, 206, -1, 5, 222, + -1, 29, 222, -1, 44, 222, -1, 47, 222, -1, + 101, 222, -1, 127, 222, -1, 128, 222, -1, 214, + -1, 51, 130, 170, -1, 34, -1, 15, 222, -1, + 18, 52, -1, 132, 222, -1, 31, 208, -1, 64, + 130, -1, 106, 130, -1, 69, 130, -1, 68, 212, + -1, 104, 219, -1, 120, 130, -1, 122, 209, -1, + 138, 174, -1, 138, 174, 210, -1, 141, 218, -1, + 113, 130, -1, 130, -1, 130, 30, -1, -1, 130, + 164, 130, 26, -1, 130, 164, 130, -1, 210, 211, + -1, 211, -1, 108, 52, -1, 53, 174, -1, 212, + 213, -1, 213, -1, 130, -1, 215, 217, 216, -1, + 215, 217, 130, -1, 53, -1, 87, -1, 4, -1, + 54, -1, 56, -1, 148, -1, 67, -1, 50, -1, + 32, -1, 218, 52, -1, 52, -1, 219, 130, -1, + 130, -1, 220, 173, -1, 173, -1, 52, -1, 139, + -1, 35, -1, 52, -1, 30, -1, 224, 165, 225, + 227, 166, -1, 154, -1, 225, 226, 153, -1, 226, + 153, -1, 155, 164, 222, -1, 156, 164, 222, -1, + 227, 228, -1, 228, -1, 230, 165, 229, 231, 166, + -1, 157, 164, 222, 153, -1, 121, 164, 173, -1, + 231, 232, -1, 232, -1, 158, 164, 222, 165, 233, + 166, -1, 233, 234, 153, -1, 234, 153, -1, 159, + 164, 222, -1, 160, 164, 222, -1, 161, 164, 222, + -1, 162, 164, 222, -1, 163, 164, 222, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 296, 296, 300, 301, 302, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 336, - 342, 351, 352, 353, 354, 355, 359, 360, 361, 365, - 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, 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 + 0, 295, 295, 299, 300, 301, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 335, + 341, 350, 351, 352, 353, 354, 358, 359, 360, 364, + 368, 369, 373, 374, 375, 376, 377, 378, 379, 380, + 381, 382, 383, 384, 385, 386, 387, 396, 404, 405, + 415, 417, 419, 430, 432, 434, 439, 441, 443, 445, + 447, 449, 454, 456, 460, 467, 477, 479, 481, 483, + 485, 487, 504, 509, 510, 514, 516, 518, 520, 522, + 524, 526, 528, 530, 532, 542, 544, 553, 561, 562, + 566, 567, 568, 569, 570, 571, 572, 573, 577, 584, + 594, 604, 613, 622, 631, 632, 636, 637, 638, 639, + 640, 641, 642, 651, 655, 660, 665, 678, 691, 700, + 701, 706, 707, 708, 709, 710, 711, 712, 713, 714, + 715, 716, 717, 718, 719, 723, 725, 730, 731, 732, + 740, 745, 747, 752, 753, 754, 755, 756, 757, 758, + 759, 767, 769, 774, 781, 791, 792, 793, 794, 795, + 796, 797, 813, 817, 818, 822, 823, 824, 825, 826, + 827, 828, 837, 838, 854, 860, 862, 864, 866, 868, + 871, 873, 884, 886, 888, 898, 900, 902, 904, 906, + 911, 913, 917, 921, 923, 928, 930, 934, 935, 939, + 940, 944, 959, 964, 972, 973, 977, 978, 979, 980, + 984, 985, 986, 996, 997, 1001, 1002, 1006, 1007, 1011, + 1020, 1021, 1025, 1026, 1035, 1050, 1054, 1055, 1059, 1060, + 1064, 1065, 1069, 1074, 1078, 1082, 1083, 1087, 1092, 1093, + 1097, 1099, 1101, 1103, 1105 }; #endif @@ -930,8 +927,8 @@ static const char *const yytname[] = "T_Keysdir", "T_Kod", "T_Mssntp", "T_Leapfile", "T_Limited", "T_Link", "T_Listen", "T_Logconfig", "T_Logfile", "T_Loopstats", "T_Lowpriotrap", "T_Manycastclient", "T_Manycastserver", "T_Mask", "T_Maxclock", - "T_Maxdist", "T_Maxhop", "T_Maxpoll", "T_Minclock", "T_Mindist", - "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", + "T_Maxdist", "T_Maxpoll", "T_Minclock", "T_Mindist", "T_Minimum", + "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", "T_Multicastclient", "T_Nic", "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", "T_Noquery", "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Ntp", "T_Ntpport", "T_NtpSignDsocket", "T_Orphan", @@ -990,38 +987,38 @@ static const yytype_uint16 yytoknum[] = 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 419, 61, 123, 125 + 415, 416, 417, 418, 61, 123, 125 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 168, 169, 170, 170, 170, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 172, - 172, 173, 173, 173, 173, 173, 174, 174, 174, 175, - 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, 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, - 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 + 0, 167, 168, 169, 169, 169, 170, 170, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, 170, 171, + 171, 172, 172, 172, 172, 172, 173, 173, 173, 174, + 175, 175, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 177, 178, 178, + 179, 179, 179, 180, 180, 180, 180, 180, 180, 180, + 180, 180, 181, 181, 182, 182, 183, 183, 183, 183, + 183, 183, 184, 185, 185, 186, 186, 186, 186, 186, + 186, 186, 186, 186, 186, 187, 187, 187, 188, 188, + 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, + 191, 191, 191, 191, 191, 191, 192, 192, 192, 192, + 192, 192, 192, 193, 193, 193, 193, 193, 193, 194, + 194, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 196, 196, 197, 197, 197, + 198, 199, 199, 200, 200, 200, 200, 200, 200, 200, + 200, 201, 201, 202, 202, 203, 203, 203, 203, 203, + 203, 203, 204, 205, 205, 206, 206, 206, 206, 206, + 206, 206, 207, 207, 207, 207, 207, 207, 207, 207, + 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 209, 209, 210, 210, 211, 211, 212, + 212, 213, 214, 214, 215, 215, 216, 216, 216, 216, + 217, 217, 217, 218, 218, 219, 219, 220, 220, 221, + 221, 221, 222, 222, 223, 224, 225, 225, 226, 226, + 227, 227, 228, 229, 230, 231, 231, 232, 233, 233, + 234, 234, 234, 234, 234 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1035,23 +1032,23 @@ static const yytype_uint8 yyr2[] = 1, 2, 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, 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 @@ -1060,114 +1057,114 @@ static const yytype_uint8 yyr2[] = static const yytype_uint8 yydefact[] = { 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, 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, 0, 21, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 48, 49, 226, + 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, 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 + 11, 12, 14, 15, 16, 17, 172, 0, 18, 0, + 5, 53, 223, 222, 175, 176, 54, 0, 0, 0, + 0, 0, 0, 55, 62, 65, 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, 61, 216, + 183, 180, 189, 58, 119, 0, 0, 119, 26, 59, + 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, 72, 74, 186, 214, + 60, 188, 1, 0, 4, 20, 47, 212, 211, 210, + 0, 0, 66, 67, 68, 69, 71, 70, 64, 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, 84, 75, 221, 219, 220, 77, + 76, 82, 80, 81, 79, 83, 78, 73, 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 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 50, 51, 52, 53, 54, 125, 116, 269, 270, + 55, 56, 57, 58, 83, 84, 85, 59, 166, 167, + 60, 143, 111, 201, 202, 289, 61, 219, 314, 98, + 99, 62, 213, 214, 63, 93, 94, 64, 154, 155, + 65, 101, 142, 250, 251, 122, 123, 66, 67, 276, + 180, 170, 130, 126, 239, 74, 68, 69, 279, 280, + 334, 335, 349, 336, 352, 353, 366, 367 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -136 +#define YYPACT_NINF -140 static const yytype_int16 yypact[] = { - 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 + 123, -123, -38, -140, -140, 7, -19, -18, -31, 3, + 13, -81, 3, -140, 12, -34, -80, -140, -78, -70, + -65, -54, -53, -140, -34, -34, -140, -51, -140, -40, + -36, -140, -35, 32, -16, 37, -32, -140, 2, 12, + 10, 7, -2, 440, 23, 39, 39, -140, -140, -140, + 129, 273, 6, -140, -34, -140, -34, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -24, -140, -30, + -140, -140, -140, -140, -140, -140, -140, 25, 31, 34, + 35, 106, 42, -140, -31, -140, -140, -140, -140, -140, + -140, -140, -140, 3, -140, 111, 117, 121, 13, -140, + 147, -140, 3, -140, -140, -140, -140, -140, -140, -140, + -140, -8, 49, 50, -140, 33, -140, 407, -140, -140, + -140, -140, -54, -140, -140, -140, -34, -34, -140, -140, + 51, -140, -140, -140, -140, 9, 22, -140, 112, -140, + -140, 21, -140, 12, -140, -140, -140, 7, 7, 7, + 7, 7, 7, 7, -2, -140, 136, 137, 5, 141, + 7, 7, 7, 7, 142, 150, 440, -140, -46, -140, + 151, 151, -140, 52, -140, 475, -140, -140, -140, -140, + 0, -139, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, 76, -140, -140, + 28, -8, -140, -140, -140, 5, 5, 5, 5, 77, + 156, 7, 7, 33, -140, -140, -140, -140, -140, 504, + -140, -140, 504, 23, 81, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -140, 23, 160, + -46, -140, -140, -140, -140, 7, -140, -140, 161, 164, + 165, 166, -140, -140, -140, -140, 167, 168, -140, 475, + -140, -140, -140, -140, -140, -140, -140, 57, 59, -92, + 71, -140, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, 504, 504, -140, 200, -140, + -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, + 7, 7, 64, 78, -115, -140, 67, -140, 504, -140, + -140, -140, -34, -140, -140, -140, 80, -140, 69, 88, + 7, 70, -111, -140, 82, 7, -140, -140, -140, 73, + -58, 75, 84, 86, 87, 89, 38, 99, 7, 7, + 7, 7, 7, -140, 101, -140, -140, -140, -140, -140, + -140, -140 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -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 + -140, -140, -140, -39, -140, -140, -10, -33, -140, -13, + -140, -140, -140, -140, -140, -140, 173, -140, -140, 92, + -140, -140, -1, -140, 61, -140, -140, -135, -140, -140, + 170, -140, -140, 56, -140, 253, -27, -140, -140, 116, + -140, -140, -140, -140, 24, -140, 149, -140, -140, -140, + -140, 226, -140, 248, -138, -41, -140, -140, -140, -4, + -140, -56, -140, -140, -140, -73, -140, -86 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1177,144 +1174,140 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 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, + 146, 138, 222, 147, 271, 115, 332, 248, 177, 86, + 134, 168, 173, 87, 71, 77, 277, 278, 78, 195, + 88, 112, 95, 113, 137, 196, 178, 148, 197, 332, + 70, 282, 103, 75, 76, 220, 104, 72, 144, 135, + 236, 136, 149, 179, 175, 150, 176, 351, 221, 100, + 117, 344, 118, 283, 272, 356, 273, 237, 198, 73, + 119, 89, 249, 277, 278, 120, 189, 291, 292, 293, + 294, 205, 206, 207, 208, 189, 121, 124, 215, 128, + 199, 79, 105, 80, 133, 315, 316, 90, 81, 139, + 129, 169, 82, 96, 131, 132, 114, 97, 140, 151, + 91, 361, 362, 363, 364, 365, 226, 227, 228, 229, + 230, 231, 232, 284, 114, 106, 217, 217, 285, 241, + 242, 243, 244, 107, 1, 152, 153, 108, 92, 172, + 274, 2, 141, 286, 200, 181, 3, 4, 5, 203, + 145, 6, 225, 109, 238, 7, 8, 110, 275, 209, + 9, 10, 204, 114, 11, 182, 12, 13, 186, 174, + 14, 183, 210, 190, 184, 185, 211, 212, 15, 191, + 297, 298, 187, 192, 16, 287, 17, 194, 288, 203, + 204, 218, 338, 18, 19, 224, 223, 20, 234, 235, + 317, 21, 22, 240, 245, 23, 24, 361, 362, 363, + 364, 365, 246, 252, 373, 253, 281, 295, 296, 25, + 26, 318, 320, 323, 322, 319, 324, 325, 326, 327, + 328, 330, 27, 331, 337, 28, 339, 29, 342, 30, + 31, 343, 346, 350, 355, 358, 32, 348, 360, 368, + 33, 34, 35, 36, 37, 38, 351, 39, 369, 40, + 370, 371, 375, 372, 381, 41, 329, 188, 247, 42, + 43, 44, 290, 45, 46, 102, 47, 48, 193, 299, + 233, 216, 171, 127, 321, 333, -6, 49, 345, 357, + 374, 2, 0, 0, 0, 0, 3, 4, 5, 340, + 341, 6, 0, 0, 0, 7, 8, 0, 0, 0, + 9, 10, 0, 0, 11, 0, 12, 13, 0, 354, + 14, 0, 0, 0, 359, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 16, 0, 17, 376, 377, 378, + 379, 380, 347, 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, 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, 156, 15, 0, 0, 0, 0, 0, 16, 157, + 17, 158, 0, 0, 0, 0, 0, 18, 19, 0, + 0, 20, 0, 0, 0, 21, 22, 0, 0, 23, + 24, 0, 254, 159, 0, 0, 0, 255, 0, 0, + 0, 256, 0, 25, 26, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 27, 0, 0, 28, + 0, 29, 0, 30, 31, 160, 161, 0, 162, 163, + 32, 0, 164, 257, 33, 34, 35, 36, 37, 38, + 0, 39, 0, 40, 258, 0, 0, 0, 0, 41, + 165, 0, 0, 42, 43, 44, 300, 45, 46, 0, + 47, 48, 259, 0, 301, 0, 260, 0, 261, 0, + 0, 49, 0, 0, 0, 0, 302, 303, 262, 304, + 0, 0, 0, 0, 0, 305, 0, 0, 0, 0, + 0, 0, 0, 0, 263, 264, 0, 0, 0, 0, + 0, 0, 0, 306, 0, 307, 308, 0, 309, 310, + 311, 0, 312, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 265, 0, 266, 0, 0, 0, + 267, 0, 0, 0, 268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 166, 0, 0, 0, 0, 0, 0, 0, - 315 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 313 }; static const yytype_int16 yycheck[] = { - 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, -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, + 41, 34, 137, 5, 4, 15, 121, 53, 32, 6, + 26, 44, 51, 10, 52, 46, 155, 156, 49, 27, + 17, 55, 9, 57, 34, 33, 50, 29, 36, 121, + 153, 3, 20, 52, 52, 26, 24, 30, 39, 55, + 35, 57, 44, 67, 54, 47, 56, 158, 26, 130, + 130, 166, 130, 25, 54, 166, 56, 52, 66, 52, + 130, 58, 108, 155, 156, 130, 93, 205, 206, 207, + 208, 38, 39, 40, 41, 102, 130, 130, 117, 130, + 88, 112, 70, 114, 52, 220, 221, 84, 119, 52, + 130, 52, 123, 80, 130, 130, 130, 84, 130, 101, + 97, 159, 160, 161, 162, 163, 147, 148, 149, 150, + 151, 152, 153, 85, 130, 103, 126, 127, 90, 160, + 161, 162, 163, 111, 1, 127, 128, 115, 125, 0, + 130, 8, 130, 105, 142, 165, 13, 14, 15, 130, + 130, 18, 143, 131, 139, 22, 23, 135, 148, 116, + 27, 28, 130, 130, 31, 130, 33, 34, 52, 153, + 37, 130, 129, 52, 130, 130, 133, 134, 45, 52, + 211, 212, 130, 52, 51, 147, 53, 30, 150, 130, + 130, 130, 317, 60, 61, 164, 74, 64, 52, 52, + 223, 68, 69, 52, 52, 72, 73, 159, 160, 161, + 162, 163, 52, 52, 166, 153, 130, 130, 52, 86, + 87, 130, 52, 52, 255, 248, 52, 52, 52, 52, + 52, 164, 99, 164, 153, 102, 26, 104, 164, 106, + 107, 153, 165, 164, 164, 153, 113, 157, 165, 164, + 117, 118, 119, 120, 121, 122, 158, 124, 164, 126, + 164, 164, 153, 164, 153, 132, 269, 84, 166, 136, + 137, 138, 201, 140, 141, 12, 143, 144, 98, 213, + 154, 122, 46, 25, 250, 279, 153, 154, 334, 352, + 366, 8, -1, -1, -1, -1, 13, 14, 15, 330, + 331, 18, -1, -1, -1, 22, 23, -1, -1, -1, + 27, 28, -1, -1, 31, -1, 33, 34, -1, 350, + 37, -1, -1, -1, 355, -1, -1, -1, 45, -1, + -1, -1, -1, -1, 51, -1, 53, 368, 369, 370, + 371, 372, 342, 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, 86, + 87, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 99, -1, -1, 102, -1, 104, -1, 106, + 107, -1, -1, -1, -1, -1, 113, -1, -1, -1, + 117, 118, 119, 120, 121, 122, -1, 124, -1, 126, + -1, -1, -1, -1, -1, 132, -1, -1, -1, 136, + 137, 138, -1, 140, 141, 8, 143, 144, -1, -1, + 13, 14, 15, -1, -1, 18, 153, 154, -1, 22, + 23, -1, -1, -1, 27, 28, -1, -1, 31, -1, + 33, 34, -1, -1, 37, -1, -1, -1, -1, -1, + -1, 11, 45, -1, -1, -1, -1, -1, 51, 19, + 53, 21, -1, -1, -1, -1, -1, 60, 61, -1, + -1, 64, -1, -1, -1, 68, 69, -1, -1, 72, + 73, -1, 7, 43, -1, -1, -1, 12, -1, -1, + -1, 16, -1, 86, 87, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 99, -1, -1, 102, + -1, 104, -1, 106, 107, 75, 76, -1, 78, 79, + 113, -1, 82, 48, 117, 118, 119, 120, 121, 122, + -1, 124, -1, 126, 59, -1, -1, -1, -1, 132, + 100, -1, -1, 136, 137, 138, 42, 140, 141, -1, + 143, 144, 77, -1, 50, -1, 81, -1, 83, -1, + -1, 154, -1, -1, -1, -1, 62, 63, 93, 65, + -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, + -1, -1, -1, -1, 109, 110, -1, -1, -1, -1, + -1, -1, -1, 89, -1, 91, 92, -1, 94, 95, + 96, -1, 98, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 139, -1, 141, -1, -1, -1, + 145, -1, -1, -1, 149, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, - 146 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 145 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1323,43 +1316,43 @@ 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, 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 + 64, 68, 69, 72, 73, 86, 87, 99, 102, 104, + 106, 107, 113, 117, 118, 119, 120, 121, 122, 124, + 126, 132, 136, 137, 138, 140, 141, 143, 144, 154, + 168, 169, 170, 171, 172, 177, 178, 179, 180, 184, + 187, 193, 198, 201, 204, 207, 214, 215, 223, 224, + 153, 52, 30, 52, 222, 52, 52, 46, 49, 112, + 114, 119, 123, 181, 182, 183, 6, 10, 17, 58, + 84, 97, 125, 202, 203, 9, 80, 84, 196, 197, + 130, 208, 202, 20, 24, 70, 103, 111, 115, 131, + 135, 189, 55, 57, 130, 173, 174, 130, 130, 130, + 130, 130, 212, 213, 130, 173, 220, 220, 130, 130, + 219, 130, 130, 52, 26, 55, 57, 173, 174, 52, + 130, 130, 209, 188, 189, 130, 222, 5, 29, 44, + 47, 101, 127, 128, 205, 206, 11, 19, 21, 43, + 75, 76, 78, 79, 82, 100, 185, 186, 174, 52, + 218, 218, 0, 170, 153, 173, 173, 32, 50, 67, + 217, 165, 130, 130, 130, 130, 52, 130, 183, 203, + 52, 52, 52, 197, 30, 27, 33, 36, 66, 88, + 142, 190, 191, 130, 130, 38, 39, 40, 41, 116, + 129, 133, 134, 199, 200, 170, 213, 173, 130, 194, + 26, 26, 194, 74, 164, 189, 222, 222, 222, 222, + 222, 222, 222, 206, 52, 52, 35, 52, 139, 221, + 52, 222, 222, 222, 222, 52, 52, 186, 53, 108, + 210, 211, 52, 153, 7, 12, 16, 48, 59, 77, + 81, 83, 93, 109, 110, 139, 141, 145, 149, 175, + 176, 4, 54, 56, 130, 148, 216, 155, 156, 225, + 226, 130, 3, 25, 85, 90, 105, 147, 150, 192, + 191, 221, 221, 221, 221, 130, 52, 222, 222, 200, + 42, 50, 62, 63, 65, 71, 89, 91, 92, 94, + 95, 96, 98, 145, 195, 194, 194, 174, 130, 174, + 52, 211, 222, 52, 52, 52, 52, 52, 52, 176, + 164, 164, 121, 226, 227, 228, 230, 153, 194, 26, + 222, 222, 164, 153, 166, 228, 165, 173, 157, 229, + 164, 158, 231, 232, 222, 164, 166, 232, 153, 222, + 165, 159, 160, 161, 162, 163, 233, 234, 164, 164, + 164, 164, 164, 166, 234, 153, 222, 222, 222, 222, + 222, 153 }; #define yyerrok (yyerrstatus = 0) @@ -2173,7 +2166,7 @@ yyreduce: case 5: /* Line 1455 of yacc.c */ -#line 303 "ntp_parser.y" +#line 302 "ntp_parser.y" { /* I will need to incorporate much more fine grained * error messages. The following should suffice for @@ -2190,7 +2183,7 @@ yyreduce: case 19: /* Line 1455 of yacc.c */ -#line 337 "ntp_parser.y" +#line 336 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)); if (my_node) @@ -2201,7 +2194,7 @@ yyreduce: case 20: /* Line 1455 of yacc.c */ -#line 343 "ntp_parser.y" +#line 342 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL); if (my_node) @@ -2212,147 +2205,147 @@ yyreduce: case 27: /* Line 1455 of yacc.c */ -#line 360 "ntp_parser.y" +#line 359 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); } break; case 28: /* Line 1455 of yacc.c */ -#line 361 "ntp_parser.y" +#line 360 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); } break; case 29: /* Line 1455 of yacc.c */ -#line 365 "ntp_parser.y" +#line 364 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); } break; case 30: /* Line 1455 of yacc.c */ -#line 369 "ntp_parser.y" +#line 368 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 31: /* Line 1455 of yacc.c */ -#line 370 "ntp_parser.y" +#line 369 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 32: /* Line 1455 of yacc.c */ -#line 374 "ntp_parser.y" +#line 373 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 33: /* Line 1455 of yacc.c */ -#line 375 "ntp_parser.y" +#line 374 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 34: /* Line 1455 of yacc.c */ -#line 376 "ntp_parser.y" +#line 375 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 35: /* Line 1455 of yacc.c */ -#line 377 "ntp_parser.y" +#line 376 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 36: /* Line 1455 of yacc.c */ -#line 378 "ntp_parser.y" +#line 377 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 37: /* Line 1455 of yacc.c */ -#line 379 "ntp_parser.y" +#line 378 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 38: /* Line 1455 of yacc.c */ -#line 380 "ntp_parser.y" +#line 379 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 39: /* Line 1455 of yacc.c */ -#line 381 "ntp_parser.y" +#line 380 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 40: /* Line 1455 of yacc.c */ -#line 382 "ntp_parser.y" +#line 381 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 41: /* Line 1455 of yacc.c */ -#line 383 "ntp_parser.y" +#line 382 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 42: /* Line 1455 of yacc.c */ -#line 384 "ntp_parser.y" +#line 383 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 43: /* Line 1455 of yacc.c */ -#line 385 "ntp_parser.y" +#line 384 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 44: /* Line 1455 of yacc.c */ -#line 386 "ntp_parser.y" +#line 385 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 45: /* Line 1455 of yacc.c */ -#line 387 "ntp_parser.y" +#line 386 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 46: /* Line 1455 of yacc.c */ -#line 388 "ntp_parser.y" +#line 387 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 47: /* Line 1455 of yacc.c */ -#line 398 "ntp_parser.y" +#line 397 "ntp_parser.y" { struct unpeer_node *my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); if (my_node) @@ -2363,42 +2356,42 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 417 "ntp_parser.y" +#line 416 "ntp_parser.y" { cfgt.broadcastclient = 1; } break; case 51: /* Line 1455 of yacc.c */ -#line 419 "ntp_parser.y" +#line 418 "ntp_parser.y" { append_queue(cfgt.manycastserver, (yyvsp[(2) - (2)].Queue)); } break; case 52: /* Line 1455 of yacc.c */ -#line 421 "ntp_parser.y" +#line 420 "ntp_parser.y" { append_queue(cfgt.multicastclient, (yyvsp[(2) - (2)].Queue)); } break; case 53: /* Line 1455 of yacc.c */ -#line 432 "ntp_parser.y" +#line 431 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; case 54: /* Line 1455 of yacc.c */ -#line 434 "ntp_parser.y" +#line 433 "ntp_parser.y" { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; case 55: /* Line 1455 of yacc.c */ -#line 436 "ntp_parser.y" +#line 435 "ntp_parser.y" { cfgt.auth.cryptosw++; append_queue(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue)); @@ -2408,56 +2401,56 @@ yyreduce: case 56: /* Line 1455 of yacc.c */ -#line 441 "ntp_parser.y" +#line 440 "ntp_parser.y" { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; case 57: /* Line 1455 of yacc.c */ -#line 443 "ntp_parser.y" +#line 442 "ntp_parser.y" { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; case 58: /* Line 1455 of yacc.c */ -#line 445 "ntp_parser.y" +#line 444 "ntp_parser.y" { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; case 59: /* Line 1455 of yacc.c */ -#line 447 "ntp_parser.y" +#line 446 "ntp_parser.y" { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 60: /* Line 1455 of yacc.c */ -#line 449 "ntp_parser.y" +#line 448 "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" +#line 450 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; case 63: /* Line 1455 of yacc.c */ -#line 457 "ntp_parser.y" +#line 456 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; case 64: /* Line 1455 of yacc.c */ -#line 462 "ntp_parser.y" +#line 461 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2469,7 +2462,7 @@ yyreduce: case 65: /* Line 1455 of yacc.c */ -#line 469 "ntp_parser.y" +#line 468 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2481,42 +2474,42 @@ yyreduce: case 66: /* Line 1455 of yacc.c */ -#line 479 "ntp_parser.y" +#line 478 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 67: /* Line 1455 of yacc.c */ -#line 481 "ntp_parser.y" +#line 480 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 68: /* Line 1455 of yacc.c */ -#line 483 "ntp_parser.y" +#line 482 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 69: /* Line 1455 of yacc.c */ -#line 485 "ntp_parser.y" +#line 484 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 70: /* Line 1455 of yacc.c */ -#line 487 "ntp_parser.y" +#line 486 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 71: /* Line 1455 of yacc.c */ -#line 489 "ntp_parser.y" +#line 488 "ntp_parser.y" { (yyval.Attr_val) = NULL; cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); @@ -2530,112 +2523,105 @@ yyreduce: case 72: /* Line 1455 of yacc.c */ -#line 506 "ntp_parser.y" +#line 505 "ntp_parser.y" { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; case 73: /* Line 1455 of yacc.c */ -#line 510 "ntp_parser.y" +#line 509 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 74: /* Line 1455 of yacc.c */ -#line 511 "ntp_parser.y" +#line 510 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 75: /* Line 1455 of yacc.c */ -#line 516 "ntp_parser.y" +#line 515 "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 518 "ntp_parser.y" +#line 517 "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 520 "ntp_parser.y" +#line 519 "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 522 "ntp_parser.y" +#line 521 "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 524 "ntp_parser.y" +#line 523 "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 526 "ntp_parser.y" +#line 525 "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 528 "ntp_parser.y" +#line 527 "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 530 "ntp_parser.y" +#line 529 "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 532 "ntp_parser.y" +#line 531 "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 534 "ntp_parser.y" +#line 533 "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 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 546 "ntp_parser.y" +#line 543 "ntp_parser.y" { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } break; - case 87: + case 86: /* Line 1455 of yacc.c */ -#line 548 "ntp_parser.y" +#line 545 "ntp_parser.y" { if (input_from_file) cfgt.stats_dir = (yyvsp[(2) - (2)].String); @@ -2646,34 +2632,34 @@ yyreduce: } break; - case 88: + case 87: /* Line 1455 of yacc.c */ -#line 557 "ntp_parser.y" +#line 554 "ntp_parser.y" { enqueue(cfgt.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Queue))); } break; - case 89: + case 88: /* Line 1455 of yacc.c */ -#line 564 "ntp_parser.y" +#line 561 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 90: + case 89: /* Line 1455 of yacc.c */ -#line 565 "ntp_parser.y" +#line 562 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 99: + case 98: /* Line 1455 of yacc.c */ -#line 581 "ntp_parser.y" +#line 578 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2682,10 +2668,10 @@ yyreduce: } break; - case 100: + case 99: /* Line 1455 of yacc.c */ -#line 588 "ntp_parser.y" +#line 585 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2694,10 +2680,10 @@ yyreduce: } break; - case 101: + case 100: /* Line 1455 of yacc.c */ -#line 598 "ntp_parser.y" +#line 595 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); @@ -2709,10 +2695,10 @@ yyreduce: } break; - case 102: + case 101: /* Line 1455 of yacc.c */ -#line 608 "ntp_parser.y" +#line 605 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); @@ -2723,10 +2709,10 @@ yyreduce: } break; - case 103: + case 102: /* Line 1455 of yacc.c */ -#line 617 "ntp_parser.y" +#line 614 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2737,10 +2723,10 @@ yyreduce: } break; - case 104: + case 103: /* Line 1455 of yacc.c */ -#line 626 "ntp_parser.y" +#line 623 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2751,53 +2737,53 @@ yyreduce: } break; - case 105: + case 104: /* Line 1455 of yacc.c */ -#line 634 "ntp_parser.y" +#line 631 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 106: + case 105: /* Line 1455 of yacc.c */ -#line 635 "ntp_parser.y" +#line 632 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 114: + case 113: /* Line 1455 of yacc.c */ -#line 655 "ntp_parser.y" +#line 652 "ntp_parser.y" { append_queue(cfgt.discard_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 115: + case 114: /* Line 1455 of yacc.c */ -#line 659 "ntp_parser.y" +#line 656 "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 116: + case 115: /* Line 1455 of yacc.c */ -#line 664 "ntp_parser.y" +#line 661 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 117: + case 116: /* Line 1455 of yacc.c */ -#line 669 "ntp_parser.y" +#line 666 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2812,10 +2798,10 @@ yyreduce: } break; - case 118: + case 117: /* Line 1455 of yacc.c */ -#line 682 "ntp_parser.y" +#line 679 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2830,160 +2816,160 @@ yyreduce: } break; - case 119: + case 118: /* Line 1455 of yacc.c */ -#line 695 "ntp_parser.y" +#line 692 "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 120: + case 119: /* Line 1455 of yacc.c */ -#line 703 "ntp_parser.y" +#line 700 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 121: + case 120: /* Line 1455 of yacc.c */ -#line 705 "ntp_parser.y" +#line 702 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 136: + case 135: /* Line 1455 of yacc.c */ -#line 727 "ntp_parser.y" +#line 724 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 137: + case 136: /* Line 1455 of yacc.c */ -#line 729 "ntp_parser.y" +#line 726 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; + case 137: + +/* Line 1455 of yacc.c */ +#line 730 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } + break; + case 138: /* Line 1455 of yacc.c */ -#line 733 "ntp_parser.y" +#line 731 "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 734 "ntp_parser.y" +#line 732 "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 735 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 741 "ntp_parser.y" + { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; case 141: /* Line 1455 of yacc.c */ -#line 744 "ntp_parser.y" - { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } +#line 746 "ntp_parser.y" + { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 142: /* Line 1455 of yacc.c */ -#line 749 "ntp_parser.y" - { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 748 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 143: /* Line 1455 of yacc.c */ -#line 751 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 752 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 144: /* Line 1455 of yacc.c */ -#line 755 "ntp_parser.y" +#line 753 "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 756 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 754 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 146: /* Line 1455 of yacc.c */ -#line 757 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 755 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 147: /* Line 1455 of yacc.c */ -#line 758 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 756 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 148: /* Line 1455 of yacc.c */ -#line 759 "ntp_parser.y" +#line 757 "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 760 "ntp_parser.y" +#line 758 "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 761 "ntp_parser.y" +#line 759 "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 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 771 "ntp_parser.y" +#line 768 "ntp_parser.y" { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 153: + case 152: /* Line 1455 of yacc.c */ -#line 773 "ntp_parser.y" +#line 770 "ntp_parser.y" { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 154: + case 153: /* Line 1455 of yacc.c */ -#line 778 "ntp_parser.y" +#line 775 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2992,10 +2978,10 @@ yyreduce: } break; - case 155: + case 154: /* Line 1455 of yacc.c */ -#line 785 "ntp_parser.y" +#line 782 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -3004,52 +2990,52 @@ yyreduce: } break; + case 155: + +/* Line 1455 of yacc.c */ +#line 791 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } + break; + case 156: /* Line 1455 of yacc.c */ -#line 794 "ntp_parser.y" +#line 792 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 157: /* Line 1455 of yacc.c */ -#line 795 "ntp_parser.y" +#line 793 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 158: /* Line 1455 of yacc.c */ -#line 796 "ntp_parser.y" +#line 794 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 159: /* Line 1455 of yacc.c */ -#line 797 "ntp_parser.y" +#line 795 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 160: /* Line 1455 of yacc.c */ -#line 798 "ntp_parser.y" +#line 796 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 161: /* Line 1455 of yacc.c */ -#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" +#line 798 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -3060,80 +3046,80 @@ yyreduce: } break; - case 163: + case 162: /* Line 1455 of yacc.c */ -#line 816 "ntp_parser.y" +#line 813 "ntp_parser.y" { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } break; - case 164: + case 163: /* Line 1455 of yacc.c */ -#line 820 "ntp_parser.y" +#line 817 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 165: + case 164: /* Line 1455 of yacc.c */ -#line 821 "ntp_parser.y" +#line 818 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; + case 165: + +/* Line 1455 of yacc.c */ +#line 822 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } + break; + case 166: /* Line 1455 of yacc.c */ -#line 825 "ntp_parser.y" +#line 823 "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 826 "ntp_parser.y" +#line 824 "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 827 "ntp_parser.y" +#line 825 "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 828 "ntp_parser.y" +#line 826 "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 829 "ntp_parser.y" +#line 827 "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 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" +#line 828 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; - case 174: + case 173: /* Line 1455 of yacc.c */ -#line 842 "ntp_parser.y" +#line 839 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -3151,62 +3137,62 @@ yyreduce: } break; - case 175: + case 174: /* Line 1455 of yacc.c */ -#line 858 "ntp_parser.y" +#line 855 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); } break; - case 176: + case 175: /* Line 1455 of yacc.c */ -#line 864 "ntp_parser.y" +#line 861 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 177: + case 176: /* Line 1455 of yacc.c */ -#line 866 "ntp_parser.y" +#line 863 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; - case 178: + case 177: /* Line 1455 of yacc.c */ -#line 868 "ntp_parser.y" +#line 865 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 179: + case 178: /* Line 1455 of yacc.c */ -#line 870 "ntp_parser.y" +#line 867 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; - case 180: + case 179: /* Line 1455 of yacc.c */ -#line 872 "ntp_parser.y" +#line 869 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 181: + case 180: /* Line 1455 of yacc.c */ -#line 875 "ntp_parser.y" +#line 872 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 182: + case 181: /* Line 1455 of yacc.c */ -#line 877 "ntp_parser.y" +#line 874 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3218,24 +3204,24 @@ yyreduce: } break; - case 183: + case 182: /* Line 1455 of yacc.c */ -#line 888 "ntp_parser.y" +#line 885 "ntp_parser.y" { append_queue(cfgt.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 184: + case 183: /* Line 1455 of yacc.c */ -#line 890 "ntp_parser.y" +#line 887 "ntp_parser.y" { append_queue(cfgt.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 185: + case 184: /* Line 1455 of yacc.c */ -#line 892 "ntp_parser.y" +#line 889 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3247,123 +3233,123 @@ yyreduce: } break; - case 186: + case 185: /* Line 1455 of yacc.c */ -#line 902 "ntp_parser.y" +#line 899 "ntp_parser.y" { enqueue(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 187: + case 186: /* Line 1455 of yacc.c */ -#line 904 "ntp_parser.y" +#line 901 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (2)].Address_node), NULL)); } break; - case 188: + case 187: /* Line 1455 of yacc.c */ -#line 906 "ntp_parser.y" +#line 903 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 189: + case 188: /* Line 1455 of yacc.c */ -#line 908 "ntp_parser.y" +#line 905 "ntp_parser.y" { append_queue(cfgt.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 190: + case 189: /* Line 1455 of yacc.c */ -#line 910 "ntp_parser.y" +#line 907 "ntp_parser.y" { enqueue(cfgt.qos, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 191: + case 190: /* Line 1455 of yacc.c */ -#line 915 "ntp_parser.y" +#line 912 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 192: + case 191: /* Line 1455 of yacc.c */ -#line 917 "ntp_parser.y" +#line 914 "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 193: + case 192: /* Line 1455 of yacc.c */ -#line 920 "ntp_parser.y" +#line 917 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 194: + case 193: /* Line 1455 of yacc.c */ -#line 925 "ntp_parser.y" +#line 922 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } break; - case 195: + case 194: /* Line 1455 of yacc.c */ -#line 927 "ntp_parser.y" +#line 924 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 196: + case 195: /* Line 1455 of yacc.c */ -#line 932 "ntp_parser.y" +#line 929 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 197: + case 196: /* Line 1455 of yacc.c */ -#line 933 "ntp_parser.y" +#line 930 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 198: + case 197: /* Line 1455 of yacc.c */ -#line 937 "ntp_parser.y" +#line 934 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; - case 199: + case 198: /* Line 1455 of yacc.c */ -#line 938 "ntp_parser.y" +#line 935 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node)); } break; - case 200: + case 199: /* Line 1455 of yacc.c */ -#line 942 "ntp_parser.y" +#line 939 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 201: + case 200: /* Line 1455 of yacc.c */ -#line 943 "ntp_parser.y" +#line 940 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 202: + case 201: /* Line 1455 of yacc.c */ -#line 948 "ntp_parser.y" +#line 945 "ntp_parser.y" { char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = (yyvsp[(1) - (1)].String) + 1; @@ -3377,72 +3363,72 @@ yyreduce: } break; - case 203: + case 202: /* Line 1455 of yacc.c */ -#line 963 "ntp_parser.y" +#line 960 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer))); } break; - case 204: + case 203: /* Line 1455 of yacc.c */ -#line 968 "ntp_parser.y" +#line 965 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer))); } break; - case 214: + case 213: /* Line 1455 of yacc.c */ -#line 999 "ntp_parser.y" +#line 996 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 215: + case 214: /* Line 1455 of yacc.c */ -#line 1000 "ntp_parser.y" +#line 997 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 216: + case 215: /* Line 1455 of yacc.c */ -#line 1004 "ntp_parser.y" +#line 1001 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 217: + case 216: /* Line 1455 of yacc.c */ -#line 1005 "ntp_parser.y" +#line 1002 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 218: + case 217: /* Line 1455 of yacc.c */ -#line 1009 "ntp_parser.y" +#line 1006 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 219: + case 218: /* Line 1455 of yacc.c */ -#line 1010 "ntp_parser.y" +#line 1007 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 220: + case 219: /* Line 1455 of yacc.c */ -#line 1015 "ntp_parser.y" +#line 1012 "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"); @@ -3453,31 +3439,31 @@ yyreduce: } break; - case 221: + case 220: /* Line 1455 of yacc.c */ -#line 1023 "ntp_parser.y" +#line 1020 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 222: + case 221: /* Line 1455 of yacc.c */ -#line 1024 "ntp_parser.y" +#line 1021 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 223: + case 222: /* Line 1455 of yacc.c */ -#line 1028 "ntp_parser.y" +#line 1025 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 225: + case 224: /* Line 1455 of yacc.c */ -#line 1039 "ntp_parser.y" +#line 1036 "ntp_parser.y" { cfgt.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3486,150 +3472,150 @@ yyreduce: } break; - case 226: + case 225: /* Line 1455 of yacc.c */ -#line 1053 "ntp_parser.y" +#line 1050 "ntp_parser.y" { old_config_style = 0; } break; - case 227: + case 226: /* Line 1455 of yacc.c */ -#line 1057 "ntp_parser.y" +#line 1054 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 228: + case 227: /* Line 1455 of yacc.c */ -#line 1058 "ntp_parser.y" +#line 1055 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 229: + case 228: /* Line 1455 of yacc.c */ -#line 1062 "ntp_parser.y" +#line 1059 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 230: + case 229: /* Line 1455 of yacc.c */ -#line 1063 "ntp_parser.y" +#line 1060 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 231: + case 230: /* Line 1455 of yacc.c */ -#line 1067 "ntp_parser.y" +#line 1064 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; - case 232: + case 231: /* Line 1455 of yacc.c */ -#line 1068 "ntp_parser.y" +#line 1065 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; - case 233: + case 232: /* Line 1455 of yacc.c */ -#line 1073 "ntp_parser.y" +#line 1070 "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: + case 233: /* Line 1455 of yacc.c */ -#line 1077 "ntp_parser.y" +#line 1074 "ntp_parser.y" { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; - case 235: + case 234: /* Line 1455 of yacc.c */ -#line 1081 "ntp_parser.y" +#line 1078 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; - case 236: + case 235: /* Line 1455 of yacc.c */ -#line 1085 "ntp_parser.y" +#line 1082 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; - case 237: + case 236: /* Line 1455 of yacc.c */ -#line 1086 "ntp_parser.y" +#line 1083 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; - case 238: + case 237: /* Line 1455 of yacc.c */ -#line 1091 "ntp_parser.y" +#line 1088 "ntp_parser.y" { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; - case 239: + case 238: /* Line 1455 of yacc.c */ -#line 1095 "ntp_parser.y" +#line 1092 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 240: + case 239: /* Line 1455 of yacc.c */ -#line 1096 "ntp_parser.y" +#line 1093 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 241: + case 240: /* Line 1455 of yacc.c */ -#line 1101 "ntp_parser.y" +#line 1098 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 242: + case 241: /* Line 1455 of yacc.c */ -#line 1103 "ntp_parser.y" +#line 1100 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 243: + case 242: /* Line 1455 of yacc.c */ -#line 1105 "ntp_parser.y" +#line 1102 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 244: + case 243: /* Line 1455 of yacc.c */ -#line 1107 "ntp_parser.y" +#line 1104 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 245: + case 244: /* Line 1455 of yacc.c */ -#line 1109 "ntp_parser.y" +#line 1106 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; /* Line 1455 of yacc.c */ -#line 3633 "ntp_parser.c" +#line 3619 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3841,7 +3827,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1113 "ntp_parser.y" +#line 1110 "ntp_parser.y" void yyerror (char *msg) diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h index 9110039d4..0c46a5e5d 100644 --- a/ntpd/ntp_parser.h +++ b/ntpd/ntp_parser.h @@ -113,94 +113,93 @@ T_Mask = 329, T_Maxclock = 330, T_Maxdist = 331, - T_Maxhop = 332, - T_Maxpoll = 333, - T_Minclock = 334, - T_Mindist = 335, - T_Minimum = 336, - T_Minpoll = 337, - T_Minsane = 338, - T_Mode = 339, - T_Monitor = 340, - T_Month = 341, - T_Multicastclient = 342, - T_Nic = 343, - T_Nolink = 344, - T_Nomodify = 345, - T_None = 346, - T_Nopeer = 347, - T_Noquery = 348, - T_Noselect = 349, - T_Noserve = 350, - T_Notrap = 351, - T_Notrust = 352, - T_Ntp = 353, - T_Ntpport = 354, - T_NtpSignDsocket = 355, - T_Orphan = 356, - T_Panic = 357, - T_Peer = 358, - T_Peerstats = 359, - T_Phone = 360, - T_Pid = 361, - T_Pidfile = 362, - T_Pool = 363, - T_Port = 364, - T_Preempt = 365, - T_Prefer = 366, - T_Protostats = 367, - T_Pw = 368, - T_Qos = 369, - T_Randfile = 370, - T_Rawstats = 371, - T_Refid = 372, - T_Requestkey = 373, - T_Restrict = 374, - T_Revoke = 375, - T_Saveconfigdir = 376, - T_Server = 377, - T_Setvar = 378, - T_Sign = 379, - T_Statistics = 380, - T_Stats = 381, - T_Statsdir = 382, - T_Step = 383, - T_Stepout = 384, - T_Stratum = 385, - T_String = 386, - T_Sysstats = 387, - T_Tick = 388, - T_Time1 = 389, - T_Time2 = 390, - T_Timingstats = 391, - T_Tinker = 392, - T_Tos = 393, - T_Trap = 394, - T_True = 395, - T_Trustedkey = 396, - T_Ttl = 397, - T_Type = 398, - T_Unconfig = 399, - T_Unpeer = 400, - T_Version = 401, - T_WanderThreshold = 402, - T_Week = 403, - T_Wildcard = 404, - T_Xleave = 405, - T_Year = 406, - T_Flag = 407, - T_Void = 408, - T_EOC = 409, - T_Simulate = 410, - T_Beep_Delay = 411, - T_Sim_Duration = 412, - T_Server_Offset = 413, - T_Duration = 414, - T_Freq_Offset = 415, - T_Wander = 416, - T_Jitter = 417, - T_Prop_Delay = 418, - T_Proc_Delay = 419 + T_Maxpoll = 332, + T_Minclock = 333, + T_Mindist = 334, + T_Minimum = 335, + T_Minpoll = 336, + T_Minsane = 337, + T_Mode = 338, + T_Monitor = 339, + T_Month = 340, + T_Multicastclient = 341, + T_Nic = 342, + T_Nolink = 343, + T_Nomodify = 344, + T_None = 345, + T_Nopeer = 346, + T_Noquery = 347, + T_Noselect = 348, + T_Noserve = 349, + T_Notrap = 350, + T_Notrust = 351, + T_Ntp = 352, + T_Ntpport = 353, + T_NtpSignDsocket = 354, + T_Orphan = 355, + T_Panic = 356, + T_Peer = 357, + T_Peerstats = 358, + T_Phone = 359, + T_Pid = 360, + T_Pidfile = 361, + T_Pool = 362, + T_Port = 363, + T_Preempt = 364, + T_Prefer = 365, + T_Protostats = 366, + T_Pw = 367, + T_Qos = 368, + T_Randfile = 369, + T_Rawstats = 370, + T_Refid = 371, + T_Requestkey = 372, + T_Restrict = 373, + T_Revoke = 374, + T_Saveconfigdir = 375, + T_Server = 376, + T_Setvar = 377, + T_Sign = 378, + T_Statistics = 379, + T_Stats = 380, + T_Statsdir = 381, + T_Step = 382, + T_Stepout = 383, + T_Stratum = 384, + T_String = 385, + T_Sysstats = 386, + T_Tick = 387, + T_Time1 = 388, + T_Time2 = 389, + T_Timingstats = 390, + T_Tinker = 391, + T_Tos = 392, + T_Trap = 393, + T_True = 394, + T_Trustedkey = 395, + T_Ttl = 396, + T_Type = 397, + T_Unconfig = 398, + T_Unpeer = 399, + T_Version = 400, + T_WanderThreshold = 401, + T_Week = 402, + T_Wildcard = 403, + T_Xleave = 404, + T_Year = 405, + T_Flag = 406, + T_Void = 407, + T_EOC = 408, + T_Simulate = 409, + T_Beep_Delay = 410, + T_Sim_Duration = 411, + T_Server_Offset = 412, + T_Duration = 413, + T_Freq_Offset = 414, + T_Wander = 415, + T_Jitter = 416, + T_Prop_Delay = 417, + T_Proc_Delay = 418 }; #endif /* Tokens. */ @@ -278,94 +277,93 @@ #define T_Mask 329 #define T_Maxclock 330 #define T_Maxdist 331 -#define T_Maxhop 332 -#define T_Maxpoll 333 -#define T_Minclock 334 -#define T_Mindist 335 -#define T_Minimum 336 -#define T_Minpoll 337 -#define T_Minsane 338 -#define T_Mode 339 -#define T_Monitor 340 -#define T_Month 341 -#define T_Multicastclient 342 -#define T_Nic 343 -#define T_Nolink 344 -#define T_Nomodify 345 -#define T_None 346 -#define T_Nopeer 347 -#define T_Noquery 348 -#define T_Noselect 349 -#define T_Noserve 350 -#define T_Notrap 351 -#define T_Notrust 352 -#define T_Ntp 353 -#define T_Ntpport 354 -#define T_NtpSignDsocket 355 -#define T_Orphan 356 -#define T_Panic 357 -#define T_Peer 358 -#define T_Peerstats 359 -#define T_Phone 360 -#define T_Pid 361 -#define T_Pidfile 362 -#define T_Pool 363 -#define T_Port 364 -#define T_Preempt 365 -#define T_Prefer 366 -#define T_Protostats 367 -#define T_Pw 368 -#define T_Qos 369 -#define T_Randfile 370 -#define T_Rawstats 371 -#define T_Refid 372 -#define T_Requestkey 373 -#define T_Restrict 374 -#define T_Revoke 375 -#define T_Saveconfigdir 376 -#define T_Server 377 -#define T_Setvar 378 -#define T_Sign 379 -#define T_Statistics 380 -#define T_Stats 381 -#define T_Statsdir 382 -#define T_Step 383 -#define T_Stepout 384 -#define T_Stratum 385 -#define T_String 386 -#define T_Sysstats 387 -#define T_Tick 388 -#define T_Time1 389 -#define T_Time2 390 -#define T_Timingstats 391 -#define T_Tinker 392 -#define T_Tos 393 -#define T_Trap 394 -#define T_True 395 -#define T_Trustedkey 396 -#define T_Ttl 397 -#define T_Type 398 -#define T_Unconfig 399 -#define T_Unpeer 400 -#define T_Version 401 -#define T_WanderThreshold 402 -#define T_Week 403 -#define T_Wildcard 404 -#define T_Xleave 405 -#define T_Year 406 -#define T_Flag 407 -#define T_Void 408 -#define T_EOC 409 -#define T_Simulate 410 -#define T_Beep_Delay 411 -#define T_Sim_Duration 412 -#define T_Server_Offset 413 -#define T_Duration 414 -#define T_Freq_Offset 415 -#define T_Wander 416 -#define T_Jitter 417 -#define T_Prop_Delay 418 -#define T_Proc_Delay 419 +#define T_Maxpoll 332 +#define T_Minclock 333 +#define T_Mindist 334 +#define T_Minimum 335 +#define T_Minpoll 336 +#define T_Minsane 337 +#define T_Mode 338 +#define T_Monitor 339 +#define T_Month 340 +#define T_Multicastclient 341 +#define T_Nic 342 +#define T_Nolink 343 +#define T_Nomodify 344 +#define T_None 345 +#define T_Nopeer 346 +#define T_Noquery 347 +#define T_Noselect 348 +#define T_Noserve 349 +#define T_Notrap 350 +#define T_Notrust 351 +#define T_Ntp 352 +#define T_Ntpport 353 +#define T_NtpSignDsocket 354 +#define T_Orphan 355 +#define T_Panic 356 +#define T_Peer 357 +#define T_Peerstats 358 +#define T_Phone 359 +#define T_Pid 360 +#define T_Pidfile 361 +#define T_Pool 362 +#define T_Port 363 +#define T_Preempt 364 +#define T_Prefer 365 +#define T_Protostats 366 +#define T_Pw 367 +#define T_Qos 368 +#define T_Randfile 369 +#define T_Rawstats 370 +#define T_Refid 371 +#define T_Requestkey 372 +#define T_Restrict 373 +#define T_Revoke 374 +#define T_Saveconfigdir 375 +#define T_Server 376 +#define T_Setvar 377 +#define T_Sign 378 +#define T_Statistics 379 +#define T_Stats 380 +#define T_Statsdir 381 +#define T_Step 382 +#define T_Stepout 383 +#define T_Stratum 384 +#define T_String 385 +#define T_Sysstats 386 +#define T_Tick 387 +#define T_Time1 388 +#define T_Time2 389 +#define T_Timingstats 390 +#define T_Tinker 391 +#define T_Tos 392 +#define T_Trap 393 +#define T_True 394 +#define T_Trustedkey 395 +#define T_Ttl 396 +#define T_Type 397 +#define T_Unconfig 398 +#define T_Unpeer 399 +#define T_Version 400 +#define T_WanderThreshold 401 +#define T_Week 402 +#define T_Wildcard 403 +#define T_Xleave 404 +#define T_Year 405 +#define T_Flag 406 +#define T_Void 407 +#define T_EOC 408 +#define T_Simulate 409 +#define T_Beep_Delay 410 +#define T_Sim_Duration 411 +#define T_Server_Offset 412 +#define T_Duration 413 +#define T_Freq_Offset 414 +#define T_Wander 415 +#define T_Jitter 416 +#define T_Prop_Delay 417 +#define T_Proc_Delay 418 @@ -393,7 +391,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 397 "ntp_parser.h" +#line 395 "ntp_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y index 13ea0c66f..ecbe096e7 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -137,7 +137,6 @@ %token T_Mask %token T_Maxclock %token T_Maxdist -%token T_Maxhop %token T_Maxpoll %token T_Minclock %token T_Mindist @@ -532,8 +531,6 @@ tos_option { $$ = create_attr_dval($1, (double)$2); } | T_Beacon T_Integer { $$ = create_attr_dval($1, (double)$2); } - | T_Maxhop T_Integer - { $$ = create_attr_dval($1, (double)$2); } ; diff --git a/ntpd/ntp_scanner.c b/ntpd/ntp_scanner.c index a43c19a11..940fa5b09 100644 --- a/ntpd/ntp_scanner.c +++ b/ntpd/ntp_scanner.c @@ -153,7 +153,6 @@ struct key_tok ntp_keyword_list[] = { { "cohort", T_Cohort, FOLLBY_TOKEN }, { "mindist", T_Mindist, FOLLBY_TOKEN }, { "maxdist", T_Maxdist, FOLLBY_TOKEN }, -{ "maxhop", T_Maxhop, FOLLBY_TOKEN }, { "beacon", T_Beacon, FOLLBY_TOKEN }, { "orphan", T_Orphan, FOLLBY_TOKEN }, /* access_control_flag */