From: Dave Hart Date: Tue, 6 Jul 2010 04:18:16 +0000 (+0000) Subject: Remove orphan mode startup workaround from ntp_proto.c, it's X-Git-Tag: NTP_4_2_7P40~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e494b2aa8b9299b7659e7f6198a82e23da6b8d3;p=thirdparty%2Fntp.git Remove orphan mode startup workaround from ntp_proto.c, it's not needed with the addition of sys_orphwait. Add "tos orphanwait" to set sys_orphwait. bk: 4c32ae88LTh0Tx--c8hAAMxYUHNfsw --- diff --git a/ntpd/complete.conf b/ntpd/complete.conf index 6cea4bd0b..056892db0 100644 --- a/ntpd/complete.conf +++ b/ntpd/complete.conf @@ -21,7 +21,7 @@ controlkey 12 requestkey 12 enable auth ntp monitor disable bclient calibrate kernel -tos beacon 3600 ceiling 16 cohort 0 floor 1 maxclock 10 maxdist 1.5 minclock 3 mindist 0.001 minsane 1 orphan 16 +tos beacon 3600 ceiling 16 cohort 0 floor 1 maxclock 10 maxdist 1.5 minclock 3 mindist 0.001 minsane 1 orphan 16 orphanwait 300 tinker allan 1500 dispersion 15 freq 0 huffpuff 7200 panic 1000 step 0.128 stepout 900 broadcastclient server 127.127.1.0 mode 64 prefer true diff --git a/ntpd/keyword-gen-utd b/ntpd/keyword-gen-utd index d10110771..6de5ce1ca 100644 --- a/ntpd/keyword-gen-utd +++ b/ntpd/keyword-gen-utd @@ -1 +1 @@ - * Generated 2010-04-08 16:13:13 UTC diff_ignore_line + * Generated 2010-07-06 04:03:53 UTC diff_ignore_line diff --git a/ntpd/keyword-gen.c b/ntpd/keyword-gen.c index 834bf3f03..9f28ea2d1 100644 --- a/ntpd/keyword-gen.c +++ b/ntpd/keyword-gen.c @@ -142,6 +142,7 @@ struct key_tok ntp_keywords[] = { { "maxdist", T_Maxdist, FOLLBY_TOKEN }, { "beacon", T_Beacon, FOLLBY_TOKEN }, { "orphan", T_Orphan, FOLLBY_TOKEN }, +{ "orphanwait", T_Orphanwait, FOLLBY_TOKEN }, /* access_control_flag */ { "default", T_Default, FOLLBY_TOKEN }, { "source", T_Source, FOLLBY_TOKEN }, diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index 9ae2df131..5a9059d87 100644 --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -748,6 +748,7 @@ dump_config_tree( case T_Floor: case T_Cohort: case T_Orphan: + case T_Orphanwait: case T_Minclock: case T_Maxclock: case T_Minsane: @@ -1920,6 +1921,10 @@ config_tos( item = PROTO_ORPHAN; break; + case T_Orphanwait: + item = PROTO_ORPHWAIT; + break; + case T_Mindist: item = PROTO_MINDISP; break; diff --git a/ntpd/ntp_keyword.h b/ntpd/ntp_keyword.h index 9f5ff7131..f1a76eae6 100644 --- a/ntpd/ntp_keyword.h +++ b/ntpd/ntp_keyword.h @@ -2,7 +2,7 @@ * ntp_keyword.h * * NOTE: edit this file with caution, it is generated by keyword-gen.c - * Generated 2010-04-08 16:13:13 UTC diff_ignore_line + * Generated 2010-07-06 04:03:53 UTC diff_ignore_line * */ #include "ntp_scanner.h" @@ -10,7 +10,7 @@ #define LOWEST_KEYWORD_ID 258 -const char * const keyword_text[173] = { +const char * const keyword_text[174] = { /* 0 258 T_Age */ "age", /* 1 259 T_All */ "all", /* 2 260 T_Allan */ "allan", @@ -120,75 +120,76 @@ const char * const keyword_text[173] = { /* 106 364 T_Ntpport */ "ntpport", /* 107 365 T_NtpSignDsocket */ "ntpsigndsocket", /* 108 366 T_Orphan */ "orphan", - /* 109 367 T_Panic */ "panic", - /* 110 368 T_Peer */ "peer", - /* 111 369 T_Peerstats */ "peerstats", - /* 112 370 T_Phone */ "phone", - /* 113 371 T_Pid */ "pid", - /* 114 372 T_Pidfile */ "pidfile", - /* 115 373 T_Pool */ "pool", - /* 116 374 T_Port */ "port", - /* 117 375 T_Preempt */ "preempt", - /* 118 376 T_Prefer */ "prefer", - /* 119 377 T_Protostats */ "protostats", - /* 120 378 T_Pw */ "pw", - /* 121 379 T_Qos */ "qos", - /* 122 380 T_Randfile */ "randfile", - /* 123 381 T_Rawstats */ "rawstats", - /* 124 382 T_Refid */ "refid", - /* 125 383 T_Requestkey */ "requestkey", - /* 126 384 T_Restrict */ "restrict", - /* 127 385 T_Revoke */ "revoke", - /* 128 386 T_Saveconfigdir */ "saveconfigdir", - /* 129 387 T_Server */ "server", - /* 130 388 T_Setvar */ "setvar", - /* 131 389 T_Sign */ "sign", - /* 132 390 T_Source */ "source", - /* 133 391 T_Statistics */ "statistics", - /* 134 392 T_Stats */ "stats", - /* 135 393 T_Statsdir */ "statsdir", - /* 136 394 T_Step */ "step", - /* 137 395 T_Stepout */ "stepout", - /* 138 396 T_Stratum */ "stratum", - /* 139 397 T_String */ NULL, - /* 140 398 T_Sysstats */ "sysstats", - /* 141 399 T_Tick */ "tick", - /* 142 400 T_Time1 */ "time1", - /* 143 401 T_Time2 */ "time2", - /* 144 402 T_Timingstats */ "timingstats", - /* 145 403 T_Tinker */ "tinker", - /* 146 404 T_Tos */ "tos", - /* 147 405 T_Trap */ "trap", - /* 148 406 T_True */ "true", - /* 149 407 T_Trustedkey */ "trustedkey", - /* 150 408 T_Ttl */ "ttl", - /* 151 409 T_Type */ "type", - /* 152 410 T_Unconfig */ "unconfig", - /* 153 411 T_Unpeer */ "unpeer", - /* 154 412 T_Version */ "version", - /* 155 413 T_WanderThreshold */ NULL, - /* 156 414 T_Week */ "week", - /* 157 415 T_Wildcard */ "wildcard", - /* 158 416 T_Xleave */ "xleave", - /* 159 417 T_Year */ "year", - /* 160 418 T_Flag */ NULL, - /* 161 419 T_Void */ NULL, - /* 162 420 T_EOC */ NULL, - /* 163 421 T_Simulate */ "simulate", - /* 164 422 T_Beep_Delay */ "beep_delay", - /* 165 423 T_Sim_Duration */ "simulation_duration", - /* 166 424 T_Server_Offset */ "server_offset", - /* 167 425 T_Duration */ "duration", - /* 168 426 T_Freq_Offset */ "freq_offset", - /* 169 427 T_Wander */ "wander", - /* 170 428 T_Jitter */ "jitter", - /* 171 429 T_Prop_Delay */ "prop_delay", - /* 172 430 T_Proc_Delay */ "proc_delay" + /* 109 367 T_Orphanwait */ "orphanwait", + /* 110 368 T_Panic */ "panic", + /* 111 369 T_Peer */ "peer", + /* 112 370 T_Peerstats */ "peerstats", + /* 113 371 T_Phone */ "phone", + /* 114 372 T_Pid */ "pid", + /* 115 373 T_Pidfile */ "pidfile", + /* 116 374 T_Pool */ "pool", + /* 117 375 T_Port */ "port", + /* 118 376 T_Preempt */ "preempt", + /* 119 377 T_Prefer */ "prefer", + /* 120 378 T_Protostats */ "protostats", + /* 121 379 T_Pw */ "pw", + /* 122 380 T_Qos */ "qos", + /* 123 381 T_Randfile */ "randfile", + /* 124 382 T_Rawstats */ "rawstats", + /* 125 383 T_Refid */ "refid", + /* 126 384 T_Requestkey */ "requestkey", + /* 127 385 T_Restrict */ "restrict", + /* 128 386 T_Revoke */ "revoke", + /* 129 387 T_Saveconfigdir */ "saveconfigdir", + /* 130 388 T_Server */ "server", + /* 131 389 T_Setvar */ "setvar", + /* 132 390 T_Sign */ "sign", + /* 133 391 T_Source */ "source", + /* 134 392 T_Statistics */ "statistics", + /* 135 393 T_Stats */ "stats", + /* 136 394 T_Statsdir */ "statsdir", + /* 137 395 T_Step */ "step", + /* 138 396 T_Stepout */ "stepout", + /* 139 397 T_Stratum */ "stratum", + /* 140 398 T_String */ NULL, + /* 141 399 T_Sysstats */ "sysstats", + /* 142 400 T_Tick */ "tick", + /* 143 401 T_Time1 */ "time1", + /* 144 402 T_Time2 */ "time2", + /* 145 403 T_Timingstats */ "timingstats", + /* 146 404 T_Tinker */ "tinker", + /* 147 405 T_Tos */ "tos", + /* 148 406 T_Trap */ "trap", + /* 149 407 T_True */ "true", + /* 150 408 T_Trustedkey */ "trustedkey", + /* 151 409 T_Ttl */ "ttl", + /* 152 410 T_Type */ "type", + /* 153 411 T_Unconfig */ "unconfig", + /* 154 412 T_Unpeer */ "unpeer", + /* 155 413 T_Version */ "version", + /* 156 414 T_WanderThreshold */ NULL, + /* 157 415 T_Week */ "week", + /* 158 416 T_Wildcard */ "wildcard", + /* 159 417 T_Xleave */ "xleave", + /* 160 418 T_Year */ "year", + /* 161 419 T_Flag */ NULL, + /* 162 420 T_Void */ NULL, + /* 163 421 T_EOC */ NULL, + /* 164 422 T_Simulate */ "simulate", + /* 165 423 T_Beep_Delay */ "beep_delay", + /* 166 424 T_Sim_Duration */ "simulation_duration", + /* 167 425 T_Server_Offset */ "server_offset", + /* 168 426 T_Duration */ "duration", + /* 169 427 T_Freq_Offset */ "freq_offset", + /* 170 428 T_Wander */ "wander", + /* 171 429 T_Jitter */ "jitter", + /* 172 430 T_Prop_Delay */ "prop_delay", + /* 173 431 T_Proc_Delay */ "proc_delay" }; -#define SCANNER_INIT_S 781 +#define SCANNER_INIT_S 785 -const scan_state sst[784] = { +const scan_state sst[788] = { /*SS_T( ch, f-by, match, other ), */ 0, /* 0 */ S_ST( '-', 3, 318, 0 ), /* 1 */ @@ -226,7 +227,7 @@ const scan_state sst[784] = { S_ST( 'd', 3, 34, 0 ), /* 33 beep_ */ S_ST( 'e', 3, 35, 0 ), /* 34 beep_d */ S_ST( 'l', 3, 36, 0 ), /* 35 beep_de */ - S_ST( 'a', 3, 422, 0 ), /* 36 beep_del */ + S_ST( 'a', 3, 423, 0 ), /* 36 beep_del */ S_ST( 'i', 3, 38, 26 ), /* 37 b */ S_ST( 'a', 3, 267, 0 ), /* 38 bi */ S_ST( 'r', 3, 40, 37 ), /* 39 b */ @@ -330,7 +331,7 @@ const scan_state sst[784] = { S_ST( 'a', 3, 138, 0 ), /* 137 dur */ S_ST( 't', 3, 139, 0 ), /* 138 dura */ S_ST( 'i', 3, 140, 0 ), /* 139 durat */ - S_ST( 'o', 3, 425, 0 ), /* 140 durati */ + S_ST( 'o', 3, 426, 0 ), /* 140 durati */ S_ST( 'e', 3, 142, 103 ), /* 141 */ S_ST( 'n', 3, 291, 0 ), /* 142 e */ S_ST( 'a', 3, 144, 0 ), /* 143 en */ @@ -354,7 +355,7 @@ const scan_state sst[784] = { S_ST( 'f', 3, 162, 0 ), /* 161 freq_o */ S_ST( 'f', 3, 163, 0 ), /* 162 freq_of */ S_ST( 's', 3, 164, 0 ), /* 163 freq_off */ - S_ST( 'e', 3, 426, 0 ), /* 164 freq_offs */ + S_ST( 'e', 3, 427, 0 ), /* 164 freq_offs */ S_ST( 'u', 3, 166, 157 ), /* 165 f */ S_ST( 'd', 3, 167, 0 ), /* 166 fu */ S_ST( 'g', 3, 302, 0 ), /* 167 fud */ @@ -414,7 +415,7 @@ const scan_state sst[784] = { S_ST( 'i', 3, 222, 0 ), /* 221 j */ S_ST( 't', 3, 223, 0 ), /* 222 ji */ S_ST( 't', 3, 224, 0 ), /* 223 jit */ - S_ST( 'e', 3, 428, 0 ), /* 224 jitt */ + S_ST( 'e', 3, 429, 0 ), /* 224 jitt */ S_ST( 'k', 3, 232, 220 ), /* 225 */ S_ST( 'e', 3, 320, 0 ), /* 226 k */ S_ST( 'r', 3, 228, 0 ), /* 227 ke */ @@ -439,7 +440,7 @@ const scan_state sst[784] = { S_ST( 's', 3, 247, 245 ), /* 246 li */ S_ST( 't', 3, 248, 0 ), /* 247 lis */ S_ST( 'e', 3, 328, 0 ), /* 248 list */ - S_ST( 'o', 3, 420, 240 ), /* 249 l */ + S_ST( 'o', 3, 421, 240 ), /* 249 l */ S_ST( 'g', 3, 256, 0 ), /* 250 lo */ S_ST( 'c', 3, 252, 0 ), /* 251 log */ S_ST( 'o', 3, 253, 0 ), /* 252 logc */ @@ -503,7 +504,7 @@ const scan_state sst[784] = { S_ST( 'c', 0, 0, 0 ), /* 310 T_Initalloc */ S_ST( 'm', 0, 0, 0 ), /* 311 T_Initmem */ S_ST( 'e', 1, 0, 0 ), /* 312 T_Includefile */ - S_ST( 'p', 3, 397, 0 ), /* 313 loo */ + S_ST( 'p', 3, 398, 0 ), /* 313 loo */ S_ST( 'e', 0, 0, 0 ), /* 314 T_Interface */ S_ST( '4', 0, 0, 0 ), /* 315 T_Ipv4 */ S_ST( '4', 0, 0, 0 ), /* 316 T_Ipv4_flag */ @@ -553,426 +554,430 @@ const scan_state sst[784] = { S_ST( 'e', 0, 0, 0 ), /* 360 T_Noserve */ S_ST( 'p', 0, 0, 0 ), /* 361 T_Notrap */ S_ST( 't', 0, 0, 0 ), /* 362 T_Notrust */ - S_ST( 'p', 0, 556, 0 ), /* 363 T_Ntp */ + S_ST( 'p', 0, 557, 0 ), /* 363 T_Ntp */ S_ST( 't', 0, 0, 0 ), /* 364 T_Ntpport */ S_ST( 't', 1, 0, 0 ), /* 365 T_NtpSignDsocket */ - S_ST( 'n', 0, 0, 0 ), /* 366 T_Orphan */ - S_ST( 'c', 0, 0, 0 ), /* 367 T_Panic */ - S_ST( 'r', 1, 577, 0 ), /* 368 T_Peer */ - S_ST( 's', 0, 0, 0 ), /* 369 T_Peerstats */ - S_ST( 'e', 2, 0, 0 ), /* 370 T_Phone */ - S_ST( 'd', 0, 585, 0 ), /* 371 T_Pid */ - S_ST( 'e', 1, 0, 0 ), /* 372 T_Pidfile */ - S_ST( 'l', 1, 0, 0 ), /* 373 T_Pool */ - S_ST( 't', 0, 0, 0 ), /* 374 T_Port */ - S_ST( 't', 0, 0, 0 ), /* 375 T_Preempt */ - S_ST( 'r', 0, 0, 0 ), /* 376 T_Prefer */ - S_ST( 's', 0, 0, 0 ), /* 377 T_Protostats */ - S_ST( 'w', 1, 0, 591 ), /* 378 T_Pw */ - S_ST( 's', 0, 0, 0 ), /* 379 T_Qos */ - S_ST( 'e', 1, 0, 0 ), /* 380 T_Randfile */ - S_ST( 's', 0, 0, 0 ), /* 381 T_Rawstats */ - S_ST( 'd', 1, 0, 0 ), /* 382 T_Refid */ - S_ST( 'y', 0, 0, 0 ), /* 383 T_Requestkey */ - S_ST( 't', 0, 0, 0 ), /* 384 T_Restrict */ - S_ST( 'e', 0, 0, 0 ), /* 385 T_Revoke */ - S_ST( 'r', 1, 0, 0 ), /* 386 T_Saveconfigdir */ - S_ST( 'r', 1, 665, 0 ), /* 387 T_Server */ - S_ST( 'r', 1, 0, 0 ), /* 388 T_Setvar */ - S_ST( 'n', 1, 0, 0 ), /* 389 T_Sign */ - S_ST( 'e', 0, 0, 0 ), /* 390 T_Source */ - S_ST( 's', 0, 0, 0 ), /* 391 T_Statistics */ - S_ST( 's', 0, 704, 699 ), /* 392 T_Stats */ - S_ST( 'r', 1, 0, 0 ), /* 393 T_Statsdir */ - S_ST( 'p', 0, 707, 0 ), /* 394 T_Step */ - S_ST( 't', 0, 0, 0 ), /* 395 T_Stepout */ - S_ST( 'm', 0, 0, 0 ), /* 396 T_Stratum */ - S_ST( 's', 3, 413, 0 ), /* 397 loop */ - S_ST( 's', 0, 0, 0 ), /* 398 T_Sysstats */ - S_ST( 'k', 0, 0, 0 ), /* 399 T_Tick */ - S_ST( '1', 0, 0, 0 ), /* 400 T_Time1 */ - S_ST( '2', 0, 0, 400 ), /* 401 T_Time2 */ - S_ST( 's', 0, 0, 0 ), /* 402 T_Timingstats */ - S_ST( 'r', 0, 0, 0 ), /* 403 T_Tinker */ - S_ST( 's', 0, 0, 0 ), /* 404 T_Tos */ - S_ST( 'p', 1, 0, 0 ), /* 405 T_Trap */ - S_ST( 'e', 0, 0, 0 ), /* 406 T_True */ - S_ST( 'y', 0, 0, 0 ), /* 407 T_Trustedkey */ - S_ST( 'l', 0, 0, 0 ), /* 408 T_Ttl */ - S_ST( 'e', 0, 0, 0 ), /* 409 T_Type */ - S_ST( 'g', 1, 0, 0 ), /* 410 T_Unconfig */ - S_ST( 'r', 1, 0, 0 ), /* 411 T_Unpeer */ - S_ST( 'n', 0, 0, 0 ), /* 412 T_Version */ - S_ST( 't', 3, 418, 0 ), /* 413 loops */ - S_ST( 'k', 0, 0, 0 ), /* 414 T_Week */ - S_ST( 'd', 0, 0, 0 ), /* 415 T_Wildcard */ - S_ST( 'e', 0, 0, 0 ), /* 416 T_Xleave */ - S_ST( 'r', 0, 0, 0 ), /* 417 T_Year */ - S_ST( 'a', 3, 419, 0 ), /* 418 loopst */ - S_ST( 't', 3, 331, 0 ), /* 419 loopsta */ - S_ST( 'w', 3, 431, 292 ), /* 420 lo */ - S_ST( 'e', 0, 0, 0 ), /* 421 T_Simulate */ - S_ST( 'y', 0, 0, 0 ), /* 422 T_Beep_Delay */ - S_ST( 'n', 0, 0, 0 ), /* 423 T_Sim_Duration */ - S_ST( 't', 0, 0, 0 ), /* 424 T_Server_Offset */ - S_ST( 'n', 0, 0, 0 ), /* 425 T_Duration */ - S_ST( 't', 0, 0, 0 ), /* 426 T_Freq_Offset */ - S_ST( 'r', 0, 0, 0 ), /* 427 T_Wander */ - S_ST( 'r', 0, 0, 0 ), /* 428 T_Jitter */ - S_ST( 'y', 0, 0, 0 ), /* 429 T_Prop_Delay */ - S_ST( 'y', 0, 0, 0 ), /* 430 T_Proc_Delay */ - S_ST( 'p', 3, 432, 0 ), /* 431 low */ - S_ST( 'r', 3, 433, 0 ), /* 432 lowp */ - S_ST( 'i', 3, 434, 0 ), /* 433 lowpr */ - S_ST( 'o', 3, 435, 0 ), /* 434 lowpri */ - S_ST( 't', 3, 436, 0 ), /* 435 lowprio */ - S_ST( 'r', 3, 437, 0 ), /* 436 lowpriot */ - S_ST( 'a', 3, 332, 0 ), /* 437 lowpriotr */ - S_ST( 'm', 3, 508, 233 ), /* 438 */ - S_ST( 'a', 3, 457, 0 ), /* 439 m */ - S_ST( 'n', 3, 441, 0 ), /* 440 ma */ - S_ST( 'y', 3, 442, 0 ), /* 441 man */ - S_ST( 'c', 3, 443, 0 ), /* 442 many */ - S_ST( 'a', 3, 444, 0 ), /* 443 manyc */ - S_ST( 's', 3, 445, 0 ), /* 444 manyca */ - S_ST( 't', 3, 451, 0 ), /* 445 manycas */ - S_ST( 'c', 3, 447, 0 ), /* 446 manycast */ - S_ST( 'l', 3, 448, 0 ), /* 447 manycastc */ - S_ST( 'i', 3, 449, 0 ), /* 448 manycastcl */ - S_ST( 'e', 3, 450, 0 ), /* 449 manycastcli */ - S_ST( 'n', 3, 333, 0 ), /* 450 manycastclie */ - S_ST( 's', 3, 452, 446 ), /* 451 manycast */ - S_ST( 'e', 3, 453, 0 ), /* 452 manycasts */ - S_ST( 'r', 3, 454, 0 ), /* 453 manycastse */ - S_ST( 'v', 3, 455, 0 ), /* 454 manycastser */ - S_ST( 'e', 3, 334, 0 ), /* 455 manycastserv */ - S_ST( 's', 3, 335, 440 ), /* 456 ma */ - S_ST( 'x', 3, 472, 456 ), /* 457 ma */ - S_ST( 'a', 3, 459, 0 ), /* 458 max */ - S_ST( 'g', 3, 336, 0 ), /* 459 maxa */ - S_ST( 'c', 3, 461, 458 ), /* 460 max */ - S_ST( 'l', 3, 462, 0 ), /* 461 maxc */ - S_ST( 'o', 3, 463, 0 ), /* 462 maxcl */ - S_ST( 'c', 3, 337, 0 ), /* 463 maxclo */ - S_ST( 'd', 3, 468, 460 ), /* 464 max */ - S_ST( 'e', 3, 466, 0 ), /* 465 maxd */ - S_ST( 'p', 3, 467, 0 ), /* 466 maxde */ - S_ST( 't', 3, 338, 0 ), /* 467 maxdep */ - S_ST( 'i', 3, 469, 465 ), /* 468 maxd */ - S_ST( 's', 3, 339, 0 ), /* 469 maxdi */ - S_ST( 'm', 3, 471, 464 ), /* 470 max */ - S_ST( 'e', 3, 340, 0 ), /* 471 maxm */ - S_ST( 'p', 3, 473, 470 ), /* 472 max */ - S_ST( 'o', 3, 474, 0 ), /* 473 maxp */ - S_ST( 'l', 3, 341, 0 ), /* 474 maxpo */ - S_ST( 'i', 3, 476, 439 ), /* 475 m */ - S_ST( 'n', 3, 493, 0 ), /* 476 mi */ - S_ST( 'c', 3, 478, 0 ), /* 477 min */ - S_ST( 'l', 3, 479, 0 ), /* 478 minc */ - S_ST( 'o', 3, 480, 0 ), /* 479 mincl */ - S_ST( 'c', 3, 342, 0 ), /* 480 minclo */ - S_ST( 'd', 3, 485, 477 ), /* 481 min */ - S_ST( 'e', 3, 483, 0 ), /* 482 mind */ - S_ST( 'p', 3, 484, 0 ), /* 483 minde */ - S_ST( 't', 3, 343, 0 ), /* 484 mindep */ - S_ST( 'i', 3, 486, 482 ), /* 485 mind */ - S_ST( 's', 3, 344, 0 ), /* 486 mindi */ - S_ST( 'i', 3, 488, 481 ), /* 487 min */ - S_ST( 'm', 3, 489, 0 ), /* 488 mini */ - S_ST( 'u', 3, 345, 0 ), /* 489 minim */ - S_ST( 'p', 3, 491, 487 ), /* 490 min */ - S_ST( 'o', 3, 492, 0 ), /* 491 minp */ - S_ST( 'l', 3, 346, 0 ), /* 492 minpo */ - S_ST( 's', 3, 494, 490 ), /* 493 min */ - S_ST( 'a', 3, 495, 0 ), /* 494 mins */ - S_ST( 'n', 3, 347, 0 ), /* 495 minsa */ - S_ST( 'o', 3, 498, 475 ), /* 496 m */ - S_ST( 'd', 3, 348, 0 ), /* 497 mo */ - S_ST( 'n', 3, 502, 497 ), /* 498 mo */ - S_ST( 'i', 3, 500, 0 ), /* 499 mon */ - S_ST( 't', 3, 501, 0 ), /* 500 moni */ - S_ST( 'o', 3, 349, 0 ), /* 501 monit */ - S_ST( 't', 3, 350, 499 ), /* 502 mon */ - S_ST( 'r', 3, 351, 496 ), /* 503 m */ - S_ST( 's', 3, 505, 503 ), /* 504 m */ - S_ST( 's', 3, 506, 0 ), /* 505 ms */ - S_ST( 'n', 3, 507, 0 ), /* 506 mss */ - S_ST( 't', 3, 324, 0 ), /* 507 mssn */ - S_ST( 'u', 3, 509, 504 ), /* 508 m */ - S_ST( 'l', 3, 510, 0 ), /* 509 mu */ - S_ST( 't', 3, 511, 0 ), /* 510 mul */ - S_ST( 'i', 3, 512, 0 ), /* 511 mult */ - S_ST( 'c', 3, 513, 0 ), /* 512 multi */ - S_ST( 'a', 3, 514, 0 ), /* 513 multic */ - S_ST( 's', 3, 515, 0 ), /* 514 multica */ - S_ST( 't', 3, 516, 0 ), /* 515 multicas */ - S_ST( 'c', 3, 517, 0 ), /* 516 multicast */ - S_ST( 'l', 3, 518, 0 ), /* 517 multicastc */ - S_ST( 'i', 3, 519, 0 ), /* 518 multicastcl */ - S_ST( 'e', 3, 520, 0 ), /* 519 multicastcli */ - S_ST( 'n', 3, 352, 0 ), /* 520 multicastclie */ - S_ST( 'n', 3, 552, 438 ), /* 521 */ - S_ST( 'i', 3, 353, 0 ), /* 522 n */ - S_ST( 'o', 3, 547, 522 ), /* 523 n */ - S_ST( 'l', 3, 525, 0 ), /* 524 no */ - S_ST( 'i', 3, 526, 0 ), /* 525 nol */ - S_ST( 'n', 3, 354, 0 ), /* 526 noli */ - S_ST( 'm', 3, 528, 524 ), /* 527 no */ - S_ST( 'o', 3, 529, 0 ), /* 528 nom */ - S_ST( 'd', 3, 530, 0 ), /* 529 nomo */ - S_ST( 'i', 3, 531, 0 ), /* 530 nomod */ - S_ST( 'f', 3, 355, 0 ), /* 531 nomodi */ - S_ST( 'n', 3, 356, 527 ), /* 532 no */ - S_ST( 'p', 3, 534, 532 ), /* 533 no */ - S_ST( 'e', 3, 535, 0 ), /* 534 nop */ - S_ST( 'e', 3, 357, 0 ), /* 535 nope */ - S_ST( 'q', 3, 537, 533 ), /* 536 no */ - S_ST( 'u', 3, 538, 0 ), /* 537 noq */ - S_ST( 'e', 3, 539, 0 ), /* 538 noqu */ - S_ST( 'r', 3, 358, 0 ), /* 539 noque */ - S_ST( 's', 3, 541, 536 ), /* 540 no */ - S_ST( 'e', 3, 545, 0 ), /* 541 nos */ - S_ST( 'l', 3, 543, 0 ), /* 542 nose */ - S_ST( 'e', 3, 544, 0 ), /* 543 nosel */ - S_ST( 'c', 3, 359, 0 ), /* 544 nosele */ - S_ST( 'r', 3, 546, 542 ), /* 545 nose */ - S_ST( 'v', 3, 360, 0 ), /* 546 noser */ - S_ST( 't', 3, 548, 540 ), /* 547 no */ - S_ST( 'r', 3, 550, 0 ), /* 548 not */ - S_ST( 'a', 3, 361, 0 ), /* 549 notr */ - S_ST( 'u', 3, 551, 549 ), /* 550 notr */ - S_ST( 's', 3, 362, 0 ), /* 551 notru */ - S_ST( 't', 3, 363, 523 ), /* 552 n */ - S_ST( 'p', 3, 554, 0 ), /* 553 ntp */ - S_ST( 'o', 3, 555, 0 ), /* 554 ntpp */ - S_ST( 'r', 3, 364, 0 ), /* 555 ntppo */ - S_ST( 's', 3, 557, 553 ), /* 556 ntp */ - S_ST( 'i', 3, 558, 0 ), /* 557 ntps */ - S_ST( 'g', 3, 559, 0 ), /* 558 ntpsi */ - S_ST( 'n', 3, 560, 0 ), /* 559 ntpsig */ - S_ST( 'd', 3, 561, 0 ), /* 560 ntpsign */ - S_ST( 's', 3, 562, 0 ), /* 561 ntpsignd */ - S_ST( 'o', 3, 563, 0 ), /* 562 ntpsignds */ - S_ST( 'c', 3, 564, 0 ), /* 563 ntpsigndso */ - S_ST( 'k', 3, 565, 0 ), /* 564 ntpsigndsoc */ - S_ST( 'e', 3, 365, 0 ), /* 565 ntpsigndsock */ - S_ST( 'o', 3, 567, 521 ), /* 566 */ - S_ST( 'r', 3, 568, 0 ), /* 567 o */ - S_ST( 'p', 3, 569, 0 ), /* 568 or */ - S_ST( 'h', 3, 570, 0 ), /* 569 orp */ - S_ST( 'a', 3, 366, 0 ), /* 570 orph */ - S_ST( 'p', 3, 378, 566 ), /* 571 */ - S_ST( 'a', 3, 573, 0 ), /* 572 p */ - S_ST( 'n', 3, 574, 0 ), /* 573 pa */ - S_ST( 'i', 3, 367, 0 ), /* 574 pan */ - S_ST( 'e', 3, 576, 572 ), /* 575 p */ - S_ST( 'e', 3, 368, 0 ), /* 576 pe */ - S_ST( 's', 3, 578, 0 ), /* 577 peer */ - S_ST( 't', 3, 579, 0 ), /* 578 peers */ - S_ST( 'a', 3, 580, 0 ), /* 579 peerst */ - S_ST( 't', 3, 369, 0 ), /* 580 peersta */ - S_ST( 'h', 3, 582, 575 ), /* 581 p */ - S_ST( 'o', 3, 583, 0 ), /* 582 ph */ - S_ST( 'n', 3, 370, 0 ), /* 583 pho */ - S_ST( 'i', 3, 371, 581 ), /* 584 p */ - S_ST( 'f', 3, 586, 0 ), /* 585 pid */ - S_ST( 'i', 3, 587, 0 ), /* 586 pidf */ - S_ST( 'l', 3, 372, 0 ), /* 587 pidfi */ - S_ST( 'o', 3, 590, 584 ), /* 588 p */ - S_ST( 'o', 3, 373, 0 ), /* 589 po */ - S_ST( 'r', 3, 374, 589 ), /* 590 po */ - S_ST( 'r', 3, 598, 588 ), /* 591 p */ - S_ST( 'e', 3, 596, 0 ), /* 592 pr */ - S_ST( 'e', 3, 594, 0 ), /* 593 pre */ - S_ST( 'm', 3, 595, 0 ), /* 594 pree */ - S_ST( 'p', 3, 375, 0 ), /* 595 preem */ - S_ST( 'f', 3, 597, 593 ), /* 596 pre */ - S_ST( 'e', 3, 376, 0 ), /* 597 pref */ - S_ST( 'o', 3, 611, 592 ), /* 598 pr */ - S_ST( 'c', 3, 600, 0 ), /* 599 pro */ - S_ST( '_', 3, 601, 0 ), /* 600 proc */ - S_ST( 'd', 3, 602, 0 ), /* 601 proc_ */ - S_ST( 'e', 3, 603, 0 ), /* 602 proc_d */ - S_ST( 'l', 3, 604, 0 ), /* 603 proc_de */ - S_ST( 'a', 3, 430, 0 ), /* 604 proc_del */ - S_ST( 'p', 3, 606, 599 ), /* 605 pro */ - S_ST( '_', 3, 607, 0 ), /* 606 prop */ - S_ST( 'd', 3, 608, 0 ), /* 607 prop_ */ - S_ST( 'e', 3, 609, 0 ), /* 608 prop_d */ - S_ST( 'l', 3, 610, 0 ), /* 609 prop_de */ - S_ST( 'a', 3, 429, 0 ), /* 610 prop_del */ - S_ST( 't', 3, 612, 605 ), /* 611 pro */ - S_ST( 'o', 3, 613, 0 ), /* 612 prot */ - S_ST( 's', 3, 614, 0 ), /* 613 proto */ - S_ST( 't', 3, 615, 0 ), /* 614 protos */ - S_ST( 'a', 3, 616, 0 ), /* 615 protost */ - S_ST( 't', 3, 377, 0 ), /* 616 protosta */ - S_ST( 'q', 3, 618, 571 ), /* 617 */ - S_ST( 'o', 3, 379, 0 ), /* 618 q */ - S_ST( 'r', 3, 631, 617 ), /* 619 */ - S_ST( 'a', 3, 626, 0 ), /* 620 r */ - S_ST( 'n', 3, 622, 0 ), /* 621 ra */ - S_ST( 'd', 3, 623, 0 ), /* 622 ran */ - S_ST( 'f', 3, 624, 0 ), /* 623 rand */ - S_ST( 'i', 3, 625, 0 ), /* 624 randf */ - S_ST( 'l', 3, 380, 0 ), /* 625 randfi */ - S_ST( 'w', 3, 627, 621 ), /* 626 ra */ - S_ST( 's', 3, 628, 0 ), /* 627 raw */ - S_ST( 't', 3, 629, 0 ), /* 628 raws */ - S_ST( 'a', 3, 630, 0 ), /* 629 rawst */ - S_ST( 't', 3, 381, 0 ), /* 630 rawsta */ - S_ST( 'e', 3, 646, 620 ), /* 631 r */ - S_ST( 'f', 3, 633, 0 ), /* 632 re */ - S_ST( 'i', 3, 382, 0 ), /* 633 ref */ - S_ST( 'q', 3, 635, 632 ), /* 634 re */ - S_ST( 'u', 3, 636, 0 ), /* 635 req */ - S_ST( 'e', 3, 637, 0 ), /* 636 requ */ - S_ST( 's', 3, 638, 0 ), /* 637 reque */ - S_ST( 't', 3, 639, 0 ), /* 638 reques */ - S_ST( 'k', 3, 640, 0 ), /* 639 request */ - S_ST( 'e', 3, 383, 0 ), /* 640 requestk */ - S_ST( 's', 3, 642, 634 ), /* 641 re */ - S_ST( 't', 3, 643, 0 ), /* 642 res */ - S_ST( 'r', 3, 644, 0 ), /* 643 rest */ - S_ST( 'i', 3, 645, 0 ), /* 644 restr */ - S_ST( 'c', 3, 384, 0 ), /* 645 restri */ - S_ST( 'v', 3, 647, 641 ), /* 646 re */ - S_ST( 'o', 3, 648, 0 ), /* 647 rev */ - S_ST( 'k', 3, 385, 0 ), /* 648 revo */ - S_ST( 's', 3, 713, 619 ), /* 649 */ - S_ST( 'a', 3, 651, 0 ), /* 650 s */ - S_ST( 'v', 3, 652, 0 ), /* 651 sa */ - S_ST( 'e', 3, 653, 0 ), /* 652 sav */ - S_ST( 'c', 3, 654, 0 ), /* 653 save */ - S_ST( 'o', 3, 655, 0 ), /* 654 savec */ - S_ST( 'n', 3, 656, 0 ), /* 655 saveco */ - S_ST( 'f', 3, 657, 0 ), /* 656 savecon */ - S_ST( 'i', 3, 658, 0 ), /* 657 saveconf */ - S_ST( 'g', 3, 659, 0 ), /* 658 saveconfi */ - S_ST( 'd', 3, 660, 0 ), /* 659 saveconfig */ - S_ST( 'i', 3, 386, 0 ), /* 660 saveconfigd */ - S_ST( 'e', 3, 671, 650 ), /* 661 s */ - S_ST( 'r', 3, 663, 0 ), /* 662 se */ - S_ST( 'v', 3, 664, 0 ), /* 663 ser */ - S_ST( 'e', 3, 387, 0 ), /* 664 serv */ - S_ST( '_', 3, 666, 0 ), /* 665 server */ - S_ST( 'o', 3, 667, 0 ), /* 666 server_ */ - S_ST( 'f', 3, 668, 0 ), /* 667 server_o */ - S_ST( 'f', 3, 669, 0 ), /* 668 server_of */ - S_ST( 's', 3, 670, 0 ), /* 669 server_off */ - S_ST( 'e', 3, 424, 0 ), /* 670 server_offs */ - S_ST( 't', 3, 672, 662 ), /* 671 se */ - S_ST( 'v', 3, 673, 0 ), /* 672 set */ - S_ST( 'a', 3, 388, 0 ), /* 673 setv */ - S_ST( 'i', 3, 676, 661 ), /* 674 s */ - S_ST( 'g', 3, 389, 0 ), /* 675 si */ - S_ST( 'm', 3, 677, 675 ), /* 676 si */ - S_ST( 'u', 3, 678, 0 ), /* 677 sim */ - S_ST( 'l', 3, 679, 0 ), /* 678 simu */ - S_ST( 'a', 3, 680, 0 ), /* 679 simul */ - S_ST( 't', 3, 681, 0 ), /* 680 simula */ - S_ST( 'i', 3, 682, 421 ), /* 681 simulat */ - S_ST( 'o', 3, 683, 0 ), /* 682 simulati */ - S_ST( 'n', 3, 684, 0 ), /* 683 simulatio */ - S_ST( '_', 3, 685, 0 ), /* 684 simulation */ - S_ST( 'd', 3, 686, 0 ), /* 685 simulation_ */ - S_ST( 'u', 3, 687, 0 ), /* 686 simulation_d */ - S_ST( 'r', 3, 688, 0 ), /* 687 simulation_du */ - S_ST( 'a', 3, 689, 0 ), /* 688 simulation_dur */ - S_ST( 't', 3, 690, 0 ), /* 689 simulation_dura */ - S_ST( 'i', 3, 691, 0 ), /* 690 simulation_durat */ - S_ST( 'o', 3, 423, 0 ), /* 691 simulation_durati */ - S_ST( 'o', 3, 693, 674 ), /* 692 s */ - S_ST( 'u', 3, 694, 0 ), /* 693 so */ - S_ST( 'r', 3, 695, 0 ), /* 694 sou */ - S_ST( 'c', 3, 390, 0 ), /* 695 sour */ - S_ST( 't', 3, 709, 692 ), /* 696 s */ - S_ST( 'a', 3, 698, 0 ), /* 697 st */ - S_ST( 't', 3, 392, 0 ), /* 698 sta */ - S_ST( 'i', 3, 700, 0 ), /* 699 stat */ - S_ST( 's', 3, 701, 0 ), /* 700 stati */ - S_ST( 't', 3, 702, 0 ), /* 701 statis */ - S_ST( 'i', 3, 703, 0 ), /* 702 statist */ - S_ST( 'c', 3, 391, 0 ), /* 703 statisti */ - S_ST( 'd', 3, 705, 0 ), /* 704 stats */ - S_ST( 'i', 3, 393, 0 ), /* 705 statsd */ - S_ST( 'e', 3, 394, 697 ), /* 706 st */ - S_ST( 'o', 3, 708, 0 ), /* 707 step */ - S_ST( 'u', 3, 395, 0 ), /* 708 stepo */ - S_ST( 'r', 3, 710, 706 ), /* 709 st */ - S_ST( 'a', 3, 711, 0 ), /* 710 str */ - S_ST( 't', 3, 712, 0 ), /* 711 stra */ - S_ST( 'u', 3, 396, 0 ), /* 712 strat */ - S_ST( 'y', 3, 714, 696 ), /* 713 s */ - S_ST( 's', 3, 715, 0 ), /* 714 sy */ - S_ST( 's', 3, 716, 0 ), /* 715 sys */ - S_ST( 't', 3, 717, 0 ), /* 716 syss */ - S_ST( 'a', 3, 718, 0 ), /* 717 sysst */ - S_ST( 't', 3, 398, 0 ), /* 718 syssta */ - S_ST( 't', 3, 745, 649 ), /* 719 */ - S_ST( 'i', 3, 731, 0 ), /* 720 t */ - S_ST( 'c', 3, 399, 0 ), /* 721 ti */ - S_ST( 'm', 3, 724, 721 ), /* 722 ti */ - S_ST( 'e', 3, 401, 0 ), /* 723 tim */ - S_ST( 'i', 3, 725, 723 ), /* 724 tim */ - S_ST( 'n', 3, 726, 0 ), /* 725 timi */ - S_ST( 'g', 3, 727, 0 ), /* 726 timin */ - S_ST( 's', 3, 728, 0 ), /* 727 timing */ - S_ST( 't', 3, 729, 0 ), /* 728 timings */ - S_ST( 'a', 3, 730, 0 ), /* 729 timingst */ - S_ST( 't', 3, 402, 0 ), /* 730 timingsta */ - S_ST( 'n', 3, 732, 722 ), /* 731 ti */ - S_ST( 'k', 3, 733, 0 ), /* 732 tin */ - S_ST( 'e', 3, 403, 0 ), /* 733 tink */ - S_ST( 'o', 3, 404, 720 ), /* 734 t */ - S_ST( 'r', 3, 737, 734 ), /* 735 t */ - S_ST( 'a', 3, 405, 0 ), /* 736 tr */ - S_ST( 'u', 3, 738, 736 ), /* 737 tr */ - S_ST( 's', 3, 739, 406 ), /* 738 tru */ - S_ST( 't', 3, 740, 0 ), /* 739 trus */ - S_ST( 'e', 3, 741, 0 ), /* 740 trust */ - S_ST( 'd', 3, 742, 0 ), /* 741 truste */ - S_ST( 'k', 3, 743, 0 ), /* 742 trusted */ - S_ST( 'e', 3, 407, 0 ), /* 743 trustedk */ - S_ST( 't', 3, 408, 735 ), /* 744 t */ - S_ST( 'y', 3, 746, 744 ), /* 745 t */ - S_ST( 'p', 3, 409, 0 ), /* 746 ty */ - S_ST( 'u', 3, 748, 719 ), /* 747 */ - S_ST( 'n', 3, 754, 0 ), /* 748 u */ - S_ST( 'c', 3, 750, 0 ), /* 749 un */ - S_ST( 'o', 3, 751, 0 ), /* 750 unc */ - S_ST( 'n', 3, 752, 0 ), /* 751 unco */ - S_ST( 'f', 3, 753, 0 ), /* 752 uncon */ - S_ST( 'i', 3, 410, 0 ), /* 753 unconf */ - S_ST( 'p', 3, 755, 749 ), /* 754 un */ - S_ST( 'e', 3, 756, 0 ), /* 755 unp */ - S_ST( 'e', 3, 411, 0 ), /* 756 unpe */ - S_ST( 'v', 3, 758, 747 ), /* 757 */ - S_ST( 'e', 3, 759, 0 ), /* 758 v */ - S_ST( 'r', 3, 760, 0 ), /* 759 ve */ - S_ST( 's', 3, 761, 0 ), /* 760 ver */ - S_ST( 'i', 3, 762, 0 ), /* 761 vers */ - S_ST( 'o', 3, 412, 0 ), /* 762 versi */ - S_ST( 'w', 3, 770, 757 ), /* 763 */ - S_ST( 'a', 3, 765, 0 ), /* 764 w */ - S_ST( 'n', 3, 766, 0 ), /* 765 wa */ - S_ST( 'd', 3, 767, 0 ), /* 766 wan */ - S_ST( 'e', 3, 427, 0 ), /* 767 wand */ - S_ST( 'e', 3, 769, 764 ), /* 768 w */ - S_ST( 'e', 3, 414, 0 ), /* 769 we */ - S_ST( 'i', 3, 771, 768 ), /* 770 w */ - S_ST( 'l', 3, 772, 0 ), /* 771 wi */ - S_ST( 'd', 3, 773, 0 ), /* 772 wil */ - S_ST( 'c', 3, 774, 0 ), /* 773 wild */ - S_ST( 'a', 3, 775, 0 ), /* 774 wildc */ - S_ST( 'r', 3, 415, 0 ), /* 775 wildca */ - S_ST( 'x', 3, 777, 763 ), /* 776 */ - S_ST( 'l', 3, 778, 0 ), /* 777 x */ - S_ST( 'e', 3, 779, 0 ), /* 778 xl */ - S_ST( 'a', 3, 780, 0 ), /* 779 xle */ - S_ST( 'v', 3, 416, 0 ), /* 780 xlea */ - S_ST( 'y', 3, 782, 776 ), /* 781 [initial state] */ - S_ST( 'e', 3, 783, 0 ), /* 782 y */ - S_ST( 'a', 3, 417, 0 ) /* 783 ye */ + S_ST( 'n', 0, 572, 0 ), /* 366 T_Orphan */ + S_ST( 't', 0, 0, 0 ), /* 367 T_Orphanwait */ + S_ST( 'c', 0, 0, 0 ), /* 368 T_Panic */ + S_ST( 'r', 1, 581, 0 ), /* 369 T_Peer */ + S_ST( 's', 0, 0, 0 ), /* 370 T_Peerstats */ + S_ST( 'e', 2, 0, 0 ), /* 371 T_Phone */ + S_ST( 'd', 0, 589, 0 ), /* 372 T_Pid */ + S_ST( 'e', 1, 0, 0 ), /* 373 T_Pidfile */ + S_ST( 'l', 1, 0, 0 ), /* 374 T_Pool */ + S_ST( 't', 0, 0, 0 ), /* 375 T_Port */ + S_ST( 't', 0, 0, 0 ), /* 376 T_Preempt */ + S_ST( 'r', 0, 0, 0 ), /* 377 T_Prefer */ + S_ST( 's', 0, 0, 0 ), /* 378 T_Protostats */ + S_ST( 'w', 1, 0, 595 ), /* 379 T_Pw */ + S_ST( 's', 0, 0, 0 ), /* 380 T_Qos */ + S_ST( 'e', 1, 0, 0 ), /* 381 T_Randfile */ + S_ST( 's', 0, 0, 0 ), /* 382 T_Rawstats */ + S_ST( 'd', 1, 0, 0 ), /* 383 T_Refid */ + S_ST( 'y', 0, 0, 0 ), /* 384 T_Requestkey */ + S_ST( 't', 0, 0, 0 ), /* 385 T_Restrict */ + S_ST( 'e', 0, 0, 0 ), /* 386 T_Revoke */ + S_ST( 'r', 1, 0, 0 ), /* 387 T_Saveconfigdir */ + S_ST( 'r', 1, 669, 0 ), /* 388 T_Server */ + S_ST( 'r', 1, 0, 0 ), /* 389 T_Setvar */ + S_ST( 'n', 1, 0, 0 ), /* 390 T_Sign */ + S_ST( 'e', 0, 0, 0 ), /* 391 T_Source */ + S_ST( 's', 0, 0, 0 ), /* 392 T_Statistics */ + S_ST( 's', 0, 708, 703 ), /* 393 T_Stats */ + S_ST( 'r', 1, 0, 0 ), /* 394 T_Statsdir */ + S_ST( 'p', 0, 711, 0 ), /* 395 T_Step */ + S_ST( 't', 0, 0, 0 ), /* 396 T_Stepout */ + S_ST( 'm', 0, 0, 0 ), /* 397 T_Stratum */ + S_ST( 's', 3, 414, 0 ), /* 398 loop */ + S_ST( 's', 0, 0, 0 ), /* 399 T_Sysstats */ + S_ST( 'k', 0, 0, 0 ), /* 400 T_Tick */ + S_ST( '1', 0, 0, 0 ), /* 401 T_Time1 */ + S_ST( '2', 0, 0, 401 ), /* 402 T_Time2 */ + S_ST( 's', 0, 0, 0 ), /* 403 T_Timingstats */ + S_ST( 'r', 0, 0, 0 ), /* 404 T_Tinker */ + S_ST( 's', 0, 0, 0 ), /* 405 T_Tos */ + S_ST( 'p', 1, 0, 0 ), /* 406 T_Trap */ + S_ST( 'e', 0, 0, 0 ), /* 407 T_True */ + S_ST( 'y', 0, 0, 0 ), /* 408 T_Trustedkey */ + S_ST( 'l', 0, 0, 0 ), /* 409 T_Ttl */ + S_ST( 'e', 0, 0, 0 ), /* 410 T_Type */ + S_ST( 'g', 1, 0, 0 ), /* 411 T_Unconfig */ + S_ST( 'r', 1, 0, 0 ), /* 412 T_Unpeer */ + S_ST( 'n', 0, 0, 0 ), /* 413 T_Version */ + S_ST( 't', 3, 419, 0 ), /* 414 loops */ + S_ST( 'k', 0, 0, 0 ), /* 415 T_Week */ + S_ST( 'd', 0, 0, 0 ), /* 416 T_Wildcard */ + S_ST( 'e', 0, 0, 0 ), /* 417 T_Xleave */ + S_ST( 'r', 0, 0, 0 ), /* 418 T_Year */ + S_ST( 'a', 3, 420, 0 ), /* 419 loopst */ + S_ST( 't', 3, 331, 0 ), /* 420 loopsta */ + S_ST( 'w', 3, 432, 292 ), /* 421 lo */ + S_ST( 'e', 0, 0, 0 ), /* 422 T_Simulate */ + S_ST( 'y', 0, 0, 0 ), /* 423 T_Beep_Delay */ + S_ST( 'n', 0, 0, 0 ), /* 424 T_Sim_Duration */ + S_ST( 't', 0, 0, 0 ), /* 425 T_Server_Offset */ + S_ST( 'n', 0, 0, 0 ), /* 426 T_Duration */ + S_ST( 't', 0, 0, 0 ), /* 427 T_Freq_Offset */ + S_ST( 'r', 0, 0, 0 ), /* 428 T_Wander */ + S_ST( 'r', 0, 0, 0 ), /* 429 T_Jitter */ + S_ST( 'y', 0, 0, 0 ), /* 430 T_Prop_Delay */ + S_ST( 'y', 0, 0, 0 ), /* 431 T_Proc_Delay */ + S_ST( 'p', 3, 433, 0 ), /* 432 low */ + S_ST( 'r', 3, 434, 0 ), /* 433 lowp */ + S_ST( 'i', 3, 435, 0 ), /* 434 lowpr */ + S_ST( 'o', 3, 436, 0 ), /* 435 lowpri */ + S_ST( 't', 3, 437, 0 ), /* 436 lowprio */ + S_ST( 'r', 3, 438, 0 ), /* 437 lowpriot */ + S_ST( 'a', 3, 332, 0 ), /* 438 lowpriotr */ + S_ST( 'm', 3, 509, 233 ), /* 439 */ + S_ST( 'a', 3, 458, 0 ), /* 440 m */ + S_ST( 'n', 3, 442, 0 ), /* 441 ma */ + S_ST( 'y', 3, 443, 0 ), /* 442 man */ + S_ST( 'c', 3, 444, 0 ), /* 443 many */ + S_ST( 'a', 3, 445, 0 ), /* 444 manyc */ + S_ST( 's', 3, 446, 0 ), /* 445 manyca */ + S_ST( 't', 3, 452, 0 ), /* 446 manycas */ + S_ST( 'c', 3, 448, 0 ), /* 447 manycast */ + S_ST( 'l', 3, 449, 0 ), /* 448 manycastc */ + S_ST( 'i', 3, 450, 0 ), /* 449 manycastcl */ + S_ST( 'e', 3, 451, 0 ), /* 450 manycastcli */ + S_ST( 'n', 3, 333, 0 ), /* 451 manycastclie */ + S_ST( 's', 3, 453, 447 ), /* 452 manycast */ + S_ST( 'e', 3, 454, 0 ), /* 453 manycasts */ + S_ST( 'r', 3, 455, 0 ), /* 454 manycastse */ + S_ST( 'v', 3, 456, 0 ), /* 455 manycastser */ + S_ST( 'e', 3, 334, 0 ), /* 456 manycastserv */ + S_ST( 's', 3, 335, 441 ), /* 457 ma */ + S_ST( 'x', 3, 473, 457 ), /* 458 ma */ + S_ST( 'a', 3, 460, 0 ), /* 459 max */ + S_ST( 'g', 3, 336, 0 ), /* 460 maxa */ + S_ST( 'c', 3, 462, 459 ), /* 461 max */ + S_ST( 'l', 3, 463, 0 ), /* 462 maxc */ + S_ST( 'o', 3, 464, 0 ), /* 463 maxcl */ + S_ST( 'c', 3, 337, 0 ), /* 464 maxclo */ + S_ST( 'd', 3, 469, 461 ), /* 465 max */ + S_ST( 'e', 3, 467, 0 ), /* 466 maxd */ + S_ST( 'p', 3, 468, 0 ), /* 467 maxde */ + S_ST( 't', 3, 338, 0 ), /* 468 maxdep */ + S_ST( 'i', 3, 470, 466 ), /* 469 maxd */ + S_ST( 's', 3, 339, 0 ), /* 470 maxdi */ + S_ST( 'm', 3, 472, 465 ), /* 471 max */ + S_ST( 'e', 3, 340, 0 ), /* 472 maxm */ + S_ST( 'p', 3, 474, 471 ), /* 473 max */ + S_ST( 'o', 3, 475, 0 ), /* 474 maxp */ + S_ST( 'l', 3, 341, 0 ), /* 475 maxpo */ + S_ST( 'i', 3, 477, 440 ), /* 476 m */ + S_ST( 'n', 3, 494, 0 ), /* 477 mi */ + S_ST( 'c', 3, 479, 0 ), /* 478 min */ + S_ST( 'l', 3, 480, 0 ), /* 479 minc */ + S_ST( 'o', 3, 481, 0 ), /* 480 mincl */ + S_ST( 'c', 3, 342, 0 ), /* 481 minclo */ + S_ST( 'd', 3, 486, 478 ), /* 482 min */ + S_ST( 'e', 3, 484, 0 ), /* 483 mind */ + S_ST( 'p', 3, 485, 0 ), /* 484 minde */ + S_ST( 't', 3, 343, 0 ), /* 485 mindep */ + S_ST( 'i', 3, 487, 483 ), /* 486 mind */ + S_ST( 's', 3, 344, 0 ), /* 487 mindi */ + S_ST( 'i', 3, 489, 482 ), /* 488 min */ + S_ST( 'm', 3, 490, 0 ), /* 489 mini */ + S_ST( 'u', 3, 345, 0 ), /* 490 minim */ + S_ST( 'p', 3, 492, 488 ), /* 491 min */ + S_ST( 'o', 3, 493, 0 ), /* 492 minp */ + S_ST( 'l', 3, 346, 0 ), /* 493 minpo */ + S_ST( 's', 3, 495, 491 ), /* 494 min */ + S_ST( 'a', 3, 496, 0 ), /* 495 mins */ + S_ST( 'n', 3, 347, 0 ), /* 496 minsa */ + S_ST( 'o', 3, 499, 476 ), /* 497 m */ + S_ST( 'd', 3, 348, 0 ), /* 498 mo */ + S_ST( 'n', 3, 503, 498 ), /* 499 mo */ + S_ST( 'i', 3, 501, 0 ), /* 500 mon */ + S_ST( 't', 3, 502, 0 ), /* 501 moni */ + S_ST( 'o', 3, 349, 0 ), /* 502 monit */ + S_ST( 't', 3, 350, 500 ), /* 503 mon */ + S_ST( 'r', 3, 351, 497 ), /* 504 m */ + S_ST( 's', 3, 506, 504 ), /* 505 m */ + S_ST( 's', 3, 507, 0 ), /* 506 ms */ + S_ST( 'n', 3, 508, 0 ), /* 507 mss */ + S_ST( 't', 3, 324, 0 ), /* 508 mssn */ + S_ST( 'u', 3, 510, 505 ), /* 509 m */ + S_ST( 'l', 3, 511, 0 ), /* 510 mu */ + S_ST( 't', 3, 512, 0 ), /* 511 mul */ + S_ST( 'i', 3, 513, 0 ), /* 512 mult */ + S_ST( 'c', 3, 514, 0 ), /* 513 multi */ + S_ST( 'a', 3, 515, 0 ), /* 514 multic */ + S_ST( 's', 3, 516, 0 ), /* 515 multica */ + S_ST( 't', 3, 517, 0 ), /* 516 multicas */ + S_ST( 'c', 3, 518, 0 ), /* 517 multicast */ + S_ST( 'l', 3, 519, 0 ), /* 518 multicastc */ + S_ST( 'i', 3, 520, 0 ), /* 519 multicastcl */ + S_ST( 'e', 3, 521, 0 ), /* 520 multicastcli */ + S_ST( 'n', 3, 352, 0 ), /* 521 multicastclie */ + S_ST( 'n', 3, 553, 439 ), /* 522 */ + S_ST( 'i', 3, 353, 0 ), /* 523 n */ + S_ST( 'o', 3, 548, 523 ), /* 524 n */ + S_ST( 'l', 3, 526, 0 ), /* 525 no */ + S_ST( 'i', 3, 527, 0 ), /* 526 nol */ + S_ST( 'n', 3, 354, 0 ), /* 527 noli */ + S_ST( 'm', 3, 529, 525 ), /* 528 no */ + S_ST( 'o', 3, 530, 0 ), /* 529 nom */ + S_ST( 'd', 3, 531, 0 ), /* 530 nomo */ + S_ST( 'i', 3, 532, 0 ), /* 531 nomod */ + S_ST( 'f', 3, 355, 0 ), /* 532 nomodi */ + S_ST( 'n', 3, 356, 528 ), /* 533 no */ + S_ST( 'p', 3, 535, 533 ), /* 534 no */ + S_ST( 'e', 3, 536, 0 ), /* 535 nop */ + S_ST( 'e', 3, 357, 0 ), /* 536 nope */ + S_ST( 'q', 3, 538, 534 ), /* 537 no */ + S_ST( 'u', 3, 539, 0 ), /* 538 noq */ + S_ST( 'e', 3, 540, 0 ), /* 539 noqu */ + S_ST( 'r', 3, 358, 0 ), /* 540 noque */ + S_ST( 's', 3, 542, 537 ), /* 541 no */ + S_ST( 'e', 3, 546, 0 ), /* 542 nos */ + S_ST( 'l', 3, 544, 0 ), /* 543 nose */ + S_ST( 'e', 3, 545, 0 ), /* 544 nosel */ + S_ST( 'c', 3, 359, 0 ), /* 545 nosele */ + S_ST( 'r', 3, 547, 543 ), /* 546 nose */ + S_ST( 'v', 3, 360, 0 ), /* 547 noser */ + S_ST( 't', 3, 549, 541 ), /* 548 no */ + S_ST( 'r', 3, 551, 0 ), /* 549 not */ + S_ST( 'a', 3, 361, 0 ), /* 550 notr */ + S_ST( 'u', 3, 552, 550 ), /* 551 notr */ + S_ST( 's', 3, 362, 0 ), /* 552 notru */ + S_ST( 't', 3, 363, 524 ), /* 553 n */ + S_ST( 'p', 3, 555, 0 ), /* 554 ntp */ + S_ST( 'o', 3, 556, 0 ), /* 555 ntpp */ + S_ST( 'r', 3, 364, 0 ), /* 556 ntppo */ + S_ST( 's', 3, 558, 554 ), /* 557 ntp */ + S_ST( 'i', 3, 559, 0 ), /* 558 ntps */ + S_ST( 'g', 3, 560, 0 ), /* 559 ntpsi */ + S_ST( 'n', 3, 561, 0 ), /* 560 ntpsig */ + S_ST( 'd', 3, 562, 0 ), /* 561 ntpsign */ + S_ST( 's', 3, 563, 0 ), /* 562 ntpsignd */ + S_ST( 'o', 3, 564, 0 ), /* 563 ntpsignds */ + S_ST( 'c', 3, 565, 0 ), /* 564 ntpsigndso */ + S_ST( 'k', 3, 566, 0 ), /* 565 ntpsigndsoc */ + S_ST( 'e', 3, 365, 0 ), /* 566 ntpsigndsock */ + S_ST( 'o', 3, 568, 522 ), /* 567 */ + S_ST( 'r', 3, 569, 0 ), /* 568 o */ + S_ST( 'p', 3, 570, 0 ), /* 569 or */ + S_ST( 'h', 3, 571, 0 ), /* 570 orp */ + S_ST( 'a', 3, 366, 0 ), /* 571 orph */ + S_ST( 'w', 3, 573, 0 ), /* 572 orphan */ + S_ST( 'a', 3, 574, 0 ), /* 573 orphanw */ + S_ST( 'i', 3, 367, 0 ), /* 574 orphanwa */ + S_ST( 'p', 3, 379, 567 ), /* 575 */ + S_ST( 'a', 3, 577, 0 ), /* 576 p */ + S_ST( 'n', 3, 578, 0 ), /* 577 pa */ + S_ST( 'i', 3, 368, 0 ), /* 578 pan */ + S_ST( 'e', 3, 580, 576 ), /* 579 p */ + S_ST( 'e', 3, 369, 0 ), /* 580 pe */ + S_ST( 's', 3, 582, 0 ), /* 581 peer */ + S_ST( 't', 3, 583, 0 ), /* 582 peers */ + S_ST( 'a', 3, 584, 0 ), /* 583 peerst */ + S_ST( 't', 3, 370, 0 ), /* 584 peersta */ + S_ST( 'h', 3, 586, 579 ), /* 585 p */ + S_ST( 'o', 3, 587, 0 ), /* 586 ph */ + S_ST( 'n', 3, 371, 0 ), /* 587 pho */ + S_ST( 'i', 3, 372, 585 ), /* 588 p */ + S_ST( 'f', 3, 590, 0 ), /* 589 pid */ + S_ST( 'i', 3, 591, 0 ), /* 590 pidf */ + S_ST( 'l', 3, 373, 0 ), /* 591 pidfi */ + S_ST( 'o', 3, 594, 588 ), /* 592 p */ + S_ST( 'o', 3, 374, 0 ), /* 593 po */ + S_ST( 'r', 3, 375, 593 ), /* 594 po */ + S_ST( 'r', 3, 602, 592 ), /* 595 p */ + S_ST( 'e', 3, 600, 0 ), /* 596 pr */ + S_ST( 'e', 3, 598, 0 ), /* 597 pre */ + S_ST( 'm', 3, 599, 0 ), /* 598 pree */ + S_ST( 'p', 3, 376, 0 ), /* 599 preem */ + S_ST( 'f', 3, 601, 597 ), /* 600 pre */ + S_ST( 'e', 3, 377, 0 ), /* 601 pref */ + S_ST( 'o', 3, 615, 596 ), /* 602 pr */ + S_ST( 'c', 3, 604, 0 ), /* 603 pro */ + S_ST( '_', 3, 605, 0 ), /* 604 proc */ + S_ST( 'd', 3, 606, 0 ), /* 605 proc_ */ + S_ST( 'e', 3, 607, 0 ), /* 606 proc_d */ + S_ST( 'l', 3, 608, 0 ), /* 607 proc_de */ + S_ST( 'a', 3, 431, 0 ), /* 608 proc_del */ + S_ST( 'p', 3, 610, 603 ), /* 609 pro */ + S_ST( '_', 3, 611, 0 ), /* 610 prop */ + S_ST( 'd', 3, 612, 0 ), /* 611 prop_ */ + S_ST( 'e', 3, 613, 0 ), /* 612 prop_d */ + S_ST( 'l', 3, 614, 0 ), /* 613 prop_de */ + S_ST( 'a', 3, 430, 0 ), /* 614 prop_del */ + S_ST( 't', 3, 616, 609 ), /* 615 pro */ + S_ST( 'o', 3, 617, 0 ), /* 616 prot */ + S_ST( 's', 3, 618, 0 ), /* 617 proto */ + S_ST( 't', 3, 619, 0 ), /* 618 protos */ + S_ST( 'a', 3, 620, 0 ), /* 619 protost */ + S_ST( 't', 3, 378, 0 ), /* 620 protosta */ + S_ST( 'q', 3, 622, 575 ), /* 621 */ + S_ST( 'o', 3, 380, 0 ), /* 622 q */ + S_ST( 'r', 3, 635, 621 ), /* 623 */ + S_ST( 'a', 3, 630, 0 ), /* 624 r */ + S_ST( 'n', 3, 626, 0 ), /* 625 ra */ + S_ST( 'd', 3, 627, 0 ), /* 626 ran */ + S_ST( 'f', 3, 628, 0 ), /* 627 rand */ + S_ST( 'i', 3, 629, 0 ), /* 628 randf */ + S_ST( 'l', 3, 381, 0 ), /* 629 randfi */ + S_ST( 'w', 3, 631, 625 ), /* 630 ra */ + S_ST( 's', 3, 632, 0 ), /* 631 raw */ + S_ST( 't', 3, 633, 0 ), /* 632 raws */ + S_ST( 'a', 3, 634, 0 ), /* 633 rawst */ + S_ST( 't', 3, 382, 0 ), /* 634 rawsta */ + S_ST( 'e', 3, 650, 624 ), /* 635 r */ + S_ST( 'f', 3, 637, 0 ), /* 636 re */ + S_ST( 'i', 3, 383, 0 ), /* 637 ref */ + S_ST( 'q', 3, 639, 636 ), /* 638 re */ + S_ST( 'u', 3, 640, 0 ), /* 639 req */ + S_ST( 'e', 3, 641, 0 ), /* 640 requ */ + S_ST( 's', 3, 642, 0 ), /* 641 reque */ + S_ST( 't', 3, 643, 0 ), /* 642 reques */ + S_ST( 'k', 3, 644, 0 ), /* 643 request */ + S_ST( 'e', 3, 384, 0 ), /* 644 requestk */ + S_ST( 's', 3, 646, 638 ), /* 645 re */ + S_ST( 't', 3, 647, 0 ), /* 646 res */ + S_ST( 'r', 3, 648, 0 ), /* 647 rest */ + S_ST( 'i', 3, 649, 0 ), /* 648 restr */ + S_ST( 'c', 3, 385, 0 ), /* 649 restri */ + S_ST( 'v', 3, 651, 645 ), /* 650 re */ + S_ST( 'o', 3, 652, 0 ), /* 651 rev */ + S_ST( 'k', 3, 386, 0 ), /* 652 revo */ + S_ST( 's', 3, 717, 623 ), /* 653 */ + S_ST( 'a', 3, 655, 0 ), /* 654 s */ + S_ST( 'v', 3, 656, 0 ), /* 655 sa */ + S_ST( 'e', 3, 657, 0 ), /* 656 sav */ + S_ST( 'c', 3, 658, 0 ), /* 657 save */ + S_ST( 'o', 3, 659, 0 ), /* 658 savec */ + S_ST( 'n', 3, 660, 0 ), /* 659 saveco */ + S_ST( 'f', 3, 661, 0 ), /* 660 savecon */ + S_ST( 'i', 3, 662, 0 ), /* 661 saveconf */ + S_ST( 'g', 3, 663, 0 ), /* 662 saveconfi */ + S_ST( 'd', 3, 664, 0 ), /* 663 saveconfig */ + S_ST( 'i', 3, 387, 0 ), /* 664 saveconfigd */ + S_ST( 'e', 3, 675, 654 ), /* 665 s */ + S_ST( 'r', 3, 667, 0 ), /* 666 se */ + S_ST( 'v', 3, 668, 0 ), /* 667 ser */ + S_ST( 'e', 3, 388, 0 ), /* 668 serv */ + S_ST( '_', 3, 670, 0 ), /* 669 server */ + S_ST( 'o', 3, 671, 0 ), /* 670 server_ */ + S_ST( 'f', 3, 672, 0 ), /* 671 server_o */ + S_ST( 'f', 3, 673, 0 ), /* 672 server_of */ + S_ST( 's', 3, 674, 0 ), /* 673 server_off */ + S_ST( 'e', 3, 425, 0 ), /* 674 server_offs */ + S_ST( 't', 3, 676, 666 ), /* 675 se */ + S_ST( 'v', 3, 677, 0 ), /* 676 set */ + S_ST( 'a', 3, 389, 0 ), /* 677 setv */ + S_ST( 'i', 3, 680, 665 ), /* 678 s */ + S_ST( 'g', 3, 390, 0 ), /* 679 si */ + S_ST( 'm', 3, 681, 679 ), /* 680 si */ + S_ST( 'u', 3, 682, 0 ), /* 681 sim */ + S_ST( 'l', 3, 683, 0 ), /* 682 simu */ + S_ST( 'a', 3, 684, 0 ), /* 683 simul */ + S_ST( 't', 3, 685, 0 ), /* 684 simula */ + S_ST( 'i', 3, 686, 422 ), /* 685 simulat */ + S_ST( 'o', 3, 687, 0 ), /* 686 simulati */ + S_ST( 'n', 3, 688, 0 ), /* 687 simulatio */ + S_ST( '_', 3, 689, 0 ), /* 688 simulation */ + S_ST( 'd', 3, 690, 0 ), /* 689 simulation_ */ + S_ST( 'u', 3, 691, 0 ), /* 690 simulation_d */ + S_ST( 'r', 3, 692, 0 ), /* 691 simulation_du */ + S_ST( 'a', 3, 693, 0 ), /* 692 simulation_dur */ + S_ST( 't', 3, 694, 0 ), /* 693 simulation_dura */ + S_ST( 'i', 3, 695, 0 ), /* 694 simulation_durat */ + S_ST( 'o', 3, 424, 0 ), /* 695 simulation_durati */ + S_ST( 'o', 3, 697, 678 ), /* 696 s */ + S_ST( 'u', 3, 698, 0 ), /* 697 so */ + S_ST( 'r', 3, 699, 0 ), /* 698 sou */ + S_ST( 'c', 3, 391, 0 ), /* 699 sour */ + S_ST( 't', 3, 713, 696 ), /* 700 s */ + S_ST( 'a', 3, 702, 0 ), /* 701 st */ + S_ST( 't', 3, 393, 0 ), /* 702 sta */ + S_ST( 'i', 3, 704, 0 ), /* 703 stat */ + S_ST( 's', 3, 705, 0 ), /* 704 stati */ + S_ST( 't', 3, 706, 0 ), /* 705 statis */ + S_ST( 'i', 3, 707, 0 ), /* 706 statist */ + S_ST( 'c', 3, 392, 0 ), /* 707 statisti */ + S_ST( 'd', 3, 709, 0 ), /* 708 stats */ + S_ST( 'i', 3, 394, 0 ), /* 709 statsd */ + S_ST( 'e', 3, 395, 701 ), /* 710 st */ + S_ST( 'o', 3, 712, 0 ), /* 711 step */ + S_ST( 'u', 3, 396, 0 ), /* 712 stepo */ + S_ST( 'r', 3, 714, 710 ), /* 713 st */ + S_ST( 'a', 3, 715, 0 ), /* 714 str */ + S_ST( 't', 3, 716, 0 ), /* 715 stra */ + S_ST( 'u', 3, 397, 0 ), /* 716 strat */ + S_ST( 'y', 3, 718, 700 ), /* 717 s */ + S_ST( 's', 3, 719, 0 ), /* 718 sy */ + S_ST( 's', 3, 720, 0 ), /* 719 sys */ + S_ST( 't', 3, 721, 0 ), /* 720 syss */ + S_ST( 'a', 3, 722, 0 ), /* 721 sysst */ + S_ST( 't', 3, 399, 0 ), /* 722 syssta */ + S_ST( 't', 3, 749, 653 ), /* 723 */ + S_ST( 'i', 3, 735, 0 ), /* 724 t */ + S_ST( 'c', 3, 400, 0 ), /* 725 ti */ + S_ST( 'm', 3, 728, 725 ), /* 726 ti */ + S_ST( 'e', 3, 402, 0 ), /* 727 tim */ + S_ST( 'i', 3, 729, 727 ), /* 728 tim */ + S_ST( 'n', 3, 730, 0 ), /* 729 timi */ + S_ST( 'g', 3, 731, 0 ), /* 730 timin */ + S_ST( 's', 3, 732, 0 ), /* 731 timing */ + S_ST( 't', 3, 733, 0 ), /* 732 timings */ + S_ST( 'a', 3, 734, 0 ), /* 733 timingst */ + S_ST( 't', 3, 403, 0 ), /* 734 timingsta */ + S_ST( 'n', 3, 736, 726 ), /* 735 ti */ + S_ST( 'k', 3, 737, 0 ), /* 736 tin */ + S_ST( 'e', 3, 404, 0 ), /* 737 tink */ + S_ST( 'o', 3, 405, 724 ), /* 738 t */ + S_ST( 'r', 3, 741, 738 ), /* 739 t */ + S_ST( 'a', 3, 406, 0 ), /* 740 tr */ + S_ST( 'u', 3, 742, 740 ), /* 741 tr */ + S_ST( 's', 3, 743, 407 ), /* 742 tru */ + S_ST( 't', 3, 744, 0 ), /* 743 trus */ + S_ST( 'e', 3, 745, 0 ), /* 744 trust */ + S_ST( 'd', 3, 746, 0 ), /* 745 truste */ + S_ST( 'k', 3, 747, 0 ), /* 746 trusted */ + S_ST( 'e', 3, 408, 0 ), /* 747 trustedk */ + S_ST( 't', 3, 409, 739 ), /* 748 t */ + S_ST( 'y', 3, 750, 748 ), /* 749 t */ + S_ST( 'p', 3, 410, 0 ), /* 750 ty */ + S_ST( 'u', 3, 752, 723 ), /* 751 */ + S_ST( 'n', 3, 758, 0 ), /* 752 u */ + S_ST( 'c', 3, 754, 0 ), /* 753 un */ + S_ST( 'o', 3, 755, 0 ), /* 754 unc */ + S_ST( 'n', 3, 756, 0 ), /* 755 unco */ + S_ST( 'f', 3, 757, 0 ), /* 756 uncon */ + S_ST( 'i', 3, 411, 0 ), /* 757 unconf */ + S_ST( 'p', 3, 759, 753 ), /* 758 un */ + S_ST( 'e', 3, 760, 0 ), /* 759 unp */ + S_ST( 'e', 3, 412, 0 ), /* 760 unpe */ + S_ST( 'v', 3, 762, 751 ), /* 761 */ + S_ST( 'e', 3, 763, 0 ), /* 762 v */ + S_ST( 'r', 3, 764, 0 ), /* 763 ve */ + S_ST( 's', 3, 765, 0 ), /* 764 ver */ + S_ST( 'i', 3, 766, 0 ), /* 765 vers */ + S_ST( 'o', 3, 413, 0 ), /* 766 versi */ + S_ST( 'w', 3, 774, 761 ), /* 767 */ + S_ST( 'a', 3, 769, 0 ), /* 768 w */ + S_ST( 'n', 3, 770, 0 ), /* 769 wa */ + S_ST( 'd', 3, 771, 0 ), /* 770 wan */ + S_ST( 'e', 3, 428, 0 ), /* 771 wand */ + S_ST( 'e', 3, 773, 768 ), /* 772 w */ + S_ST( 'e', 3, 415, 0 ), /* 773 we */ + S_ST( 'i', 3, 775, 772 ), /* 774 w */ + S_ST( 'l', 3, 776, 0 ), /* 775 wi */ + S_ST( 'd', 3, 777, 0 ), /* 776 wil */ + S_ST( 'c', 3, 778, 0 ), /* 777 wild */ + S_ST( 'a', 3, 779, 0 ), /* 778 wildc */ + S_ST( 'r', 3, 416, 0 ), /* 779 wildca */ + S_ST( 'x', 3, 781, 767 ), /* 780 */ + S_ST( 'l', 3, 782, 0 ), /* 781 x */ + S_ST( 'e', 3, 783, 0 ), /* 782 xl */ + S_ST( 'a', 3, 784, 0 ), /* 783 xle */ + S_ST( 'v', 3, 417, 0 ), /* 784 xlea */ + S_ST( 'y', 3, 786, 780 ), /* 785 [initial state] */ + S_ST( 'e', 3, 787, 0 ), /* 786 y */ + S_ST( 'a', 3, 418, 0 ) /* 787 ye */ }; diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index c255f433d..d7b395963 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -239,70 +239,71 @@ T_Ntpport = 364, T_NtpSignDsocket = 365, T_Orphan = 366, - T_Panic = 367, - T_Peer = 368, - T_Peerstats = 369, - T_Phone = 370, - T_Pid = 371, - T_Pidfile = 372, - T_Pool = 373, - T_Port = 374, - T_Preempt = 375, - T_Prefer = 376, - T_Protostats = 377, - T_Pw = 378, - T_Qos = 379, - T_Randfile = 380, - T_Rawstats = 381, - T_Refid = 382, - T_Requestkey = 383, - T_Restrict = 384, - T_Revoke = 385, - T_Saveconfigdir = 386, - T_Server = 387, - T_Setvar = 388, - T_Sign = 389, - T_Source = 390, - T_Statistics = 391, - T_Stats = 392, - T_Statsdir = 393, - T_Step = 394, - T_Stepout = 395, - T_Stratum = 396, - T_String = 397, - T_Sysstats = 398, - T_Tick = 399, - T_Time1 = 400, - T_Time2 = 401, - T_Timingstats = 402, - T_Tinker = 403, - T_Tos = 404, - T_Trap = 405, - T_True = 406, - T_Trustedkey = 407, - T_Ttl = 408, - T_Type = 409, - T_Unconfig = 410, - T_Unpeer = 411, - T_Version = 412, - T_WanderThreshold = 413, - T_Week = 414, - T_Wildcard = 415, - T_Xleave = 416, - T_Year = 417, - T_Flag = 418, - T_Void = 419, - T_EOC = 420, - T_Simulate = 421, - T_Beep_Delay = 422, - T_Sim_Duration = 423, - T_Server_Offset = 424, - T_Duration = 425, - T_Freq_Offset = 426, - T_Wander = 427, - T_Jitter = 428, - T_Prop_Delay = 429, - T_Proc_Delay = 430 + T_Orphanwait = 367, + T_Panic = 368, + T_Peer = 369, + T_Peerstats = 370, + T_Phone = 371, + T_Pid = 372, + T_Pidfile = 373, + T_Pool = 374, + T_Port = 375, + T_Preempt = 376, + T_Prefer = 377, + T_Protostats = 378, + T_Pw = 379, + T_Qos = 380, + T_Randfile = 381, + T_Rawstats = 382, + T_Refid = 383, + T_Requestkey = 384, + T_Restrict = 385, + T_Revoke = 386, + T_Saveconfigdir = 387, + T_Server = 388, + T_Setvar = 389, + T_Sign = 390, + T_Source = 391, + T_Statistics = 392, + T_Stats = 393, + T_Statsdir = 394, + T_Step = 395, + T_Stepout = 396, + T_Stratum = 397, + T_String = 398, + T_Sysstats = 399, + T_Tick = 400, + T_Time1 = 401, + T_Time2 = 402, + T_Timingstats = 403, + T_Tinker = 404, + T_Tos = 405, + T_Trap = 406, + T_True = 407, + T_Trustedkey = 408, + T_Ttl = 409, + T_Type = 410, + T_Unconfig = 411, + T_Unpeer = 412, + T_Version = 413, + T_WanderThreshold = 414, + T_Week = 415, + T_Wildcard = 416, + T_Xleave = 417, + T_Year = 418, + T_Flag = 419, + T_Void = 420, + T_EOC = 421, + T_Simulate = 422, + T_Beep_Delay = 423, + T_Sim_Duration = 424, + T_Server_Offset = 425, + T_Duration = 426, + T_Freq_Offset = 427, + T_Wander = 428, + T_Jitter = 429, + T_Prop_Delay = 430, + T_Proc_Delay = 431 }; #endif /* Tokens. */ @@ -415,70 +416,71 @@ #define T_Ntpport 364 #define T_NtpSignDsocket 365 #define T_Orphan 366 -#define T_Panic 367 -#define T_Peer 368 -#define T_Peerstats 369 -#define T_Phone 370 -#define T_Pid 371 -#define T_Pidfile 372 -#define T_Pool 373 -#define T_Port 374 -#define T_Preempt 375 -#define T_Prefer 376 -#define T_Protostats 377 -#define T_Pw 378 -#define T_Qos 379 -#define T_Randfile 380 -#define T_Rawstats 381 -#define T_Refid 382 -#define T_Requestkey 383 -#define T_Restrict 384 -#define T_Revoke 385 -#define T_Saveconfigdir 386 -#define T_Server 387 -#define T_Setvar 388 -#define T_Sign 389 -#define T_Source 390 -#define T_Statistics 391 -#define T_Stats 392 -#define T_Statsdir 393 -#define T_Step 394 -#define T_Stepout 395 -#define T_Stratum 396 -#define T_String 397 -#define T_Sysstats 398 -#define T_Tick 399 -#define T_Time1 400 -#define T_Time2 401 -#define T_Timingstats 402 -#define T_Tinker 403 -#define T_Tos 404 -#define T_Trap 405 -#define T_True 406 -#define T_Trustedkey 407 -#define T_Ttl 408 -#define T_Type 409 -#define T_Unconfig 410 -#define T_Unpeer 411 -#define T_Version 412 -#define T_WanderThreshold 413 -#define T_Week 414 -#define T_Wildcard 415 -#define T_Xleave 416 -#define T_Year 417 -#define T_Flag 418 -#define T_Void 419 -#define T_EOC 420 -#define T_Simulate 421 -#define T_Beep_Delay 422 -#define T_Sim_Duration 423 -#define T_Server_Offset 424 -#define T_Duration 425 -#define T_Freq_Offset 426 -#define T_Wander 427 -#define T_Jitter 428 -#define T_Prop_Delay 429 -#define T_Proc_Delay 430 +#define T_Orphanwait 367 +#define T_Panic 368 +#define T_Peer 369 +#define T_Peerstats 370 +#define T_Phone 371 +#define T_Pid 372 +#define T_Pidfile 373 +#define T_Pool 374 +#define T_Port 375 +#define T_Preempt 376 +#define T_Prefer 377 +#define T_Protostats 378 +#define T_Pw 379 +#define T_Qos 380 +#define T_Randfile 381 +#define T_Rawstats 382 +#define T_Refid 383 +#define T_Requestkey 384 +#define T_Restrict 385 +#define T_Revoke 386 +#define T_Saveconfigdir 387 +#define T_Server 388 +#define T_Setvar 389 +#define T_Sign 390 +#define T_Source 391 +#define T_Statistics 392 +#define T_Stats 393 +#define T_Statsdir 394 +#define T_Step 395 +#define T_Stepout 396 +#define T_Stratum 397 +#define T_String 398 +#define T_Sysstats 399 +#define T_Tick 400 +#define T_Time1 401 +#define T_Time2 402 +#define T_Timingstats 403 +#define T_Tinker 404 +#define T_Tos 405 +#define T_Trap 406 +#define T_True 407 +#define T_Trustedkey 408 +#define T_Ttl 409 +#define T_Type 410 +#define T_Unconfig 411 +#define T_Unpeer 412 +#define T_Version 413 +#define T_WanderThreshold 414 +#define T_Week 415 +#define T_Wildcard 416 +#define T_Xleave 417 +#define T_Year 418 +#define T_Flag 419 +#define T_Void 420 +#define T_EOC 421 +#define T_Simulate 422 +#define T_Beep_Delay 423 +#define T_Sim_Duration 424 +#define T_Server_Offset 425 +#define T_Duration 426 +#define T_Freq_Offset 427 +#define T_Wander 428 +#define T_Jitter 429 +#define T_Prop_Delay 430 +#define T_Proc_Delay 431 @@ -506,7 +508,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 510 "ntp_parser.c" +#line 512 "ntp_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -518,7 +520,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 522 "ntp_parser.c" +#line 524 "ntp_parser.c" #ifdef short # undef short @@ -731,22 +733,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 189 +#define YYFINAL 190 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 713 +#define YYLAST 718 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 181 +#define YYNTOKENS 182 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 73 /* YYNRULES -- Number of rules. */ -#define YYNRULES 262 +#define YYNRULES 263 /* YYNRULES -- Number of states. */ -#define YYNSTATES 415 +#define YYNSTATES 417 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 430 +#define YYMAXUTOK 431 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -758,15 +760,15 @@ 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, - 177, 178, 2, 2, 2, 2, 2, 2, 2, 2, + 178, 179, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 176, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 177, 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, 179, 2, 180, 2, 2, 2, 2, + 2, 2, 2, 180, 2, 181, 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, @@ -797,7 +799,7 @@ static const yytype_uint8 yytranslate[] = 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175 + 175, 176 }; #if YYDEBUG @@ -813,134 +815,134 @@ 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, 186, 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, 288, 292, 298, 302, - 307, 312, 316, 317, 320, 322, 324, 326, 328, 330, - 332, 334, 336, 338, 340, 342, 344, 346, 348, 351, - 353, 356, 359, 362, 365, 367, 370, 373, 376, 379, - 382, 385, 388, 391, 395, 398, 400, 403, 406, 409, - 412, 415, 418, 421, 424, 427, 430, 433, 435, 437, - 439, 441, 443, 445, 447, 449, 452, 455, 457, 460, - 463, 466, 469, 472, 475, 478, 480, 484, 486, 489, + 200, 203, 206, 209, 212, 215, 218, 221, 224, 227, + 231, 234, 236, 238, 240, 242, 244, 246, 248, 250, + 252, 255, 257, 260, 263, 265, 267, 269, 271, 273, + 275, 277, 279, 281, 283, 285, 288, 291, 295, 301, + 305, 310, 315, 319, 320, 323, 325, 327, 329, 331, + 333, 335, 337, 339, 341, 343, 345, 347, 349, 351, + 354, 356, 359, 362, 365, 368, 370, 373, 376, 379, + 382, 385, 388, 391, 394, 398, 401, 403, 406, 409, + 412, 415, 418, 421, 424, 427, 430, 433, 436, 438, + 440, 442, 444, 446, 448, 450, 452, 455, 458, 460, + 463, 466, 469, 472, 475, 478, 481, 483, 487, 489, 492, 495, 498, 501, 504, 507, 510, 513, 516, 519, - 522, 526, 529, 532, 534, 537, 538, 543, 547, 550, - 552, 555, 558, 561, 563, 565, 569, 573, 575, 577, - 579, 581, 583, 585, 587, 589, 591, 594, 596, 599, - 601, 603, 605, 611, 614, 616, 619, 621, 623, 625, - 627, 629, 631, 637, 639, 643, 646, 650, 654, 657, - 659, 665, 670, 674, 677, 679, 686, 690, 693, 697, - 701, 705, 709 + 522, 525, 529, 532, 535, 537, 540, 541, 546, 550, + 553, 555, 558, 561, 564, 566, 568, 572, 576, 578, + 580, 582, 584, 586, 588, 590, 592, 594, 597, 599, + 602, 604, 606, 608, 614, 617, 619, 622, 624, 626, + 628, 630, 632, 634, 640, 642, 646, 649, 653, 657, + 660, 662, 668, 673, 677, 680, 682, 689, 693, 696, + 700, 704, 708, 712 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 182, 0, -1, 183, -1, 183, 184, 165, -1, 184, - 165, -1, 1, 165, -1, -1, 185, -1, 191, -1, - 193, -1, 194, -1, 201, -1, 207, -1, 198, -1, - 214, -1, 217, -1, 220, -1, 223, -1, 242, -1, - 186, 187, 189, -1, 186, 187, -1, 132, -1, 118, - -1, 113, -1, 13, -1, 78, -1, 188, -1, 61, - 142, -1, 63, 142, -1, 142, -1, 189, 190, -1, - 190, -1, 7, -1, 12, 241, -1, 16, -1, 50, + 183, 0, -1, 184, -1, 184, 185, 166, -1, 185, + 166, -1, 1, 166, -1, -1, 186, -1, 192, -1, + 194, -1, 195, -1, 202, -1, 208, -1, 199, -1, + 215, -1, 218, -1, 221, -1, 224, -1, 243, -1, + 187, 188, 190, -1, 187, 188, -1, 133, -1, 119, + -1, 114, -1, 13, -1, 78, -1, 189, -1, 61, + 143, -1, 63, 143, -1, 143, -1, 190, 191, -1, + 191, -1, 7, -1, 12, 242, -1, 16, -1, 50, -1, 65, 58, -1, 91, 58, -1, 86, 58, -1, - 104, -1, 120, -1, 121, -1, 151, -1, 161, -1, - 153, 58, -1, 93, 58, -1, 157, 58, -1, 192, - 187, -1, 155, -1, 156, -1, 14, -1, 79, 239, - -1, 97, 239, -1, 8, 58, -1, 22, 58, -1, - 23, 195, -1, 66, 142, -1, 67, 142, -1, 128, - 58, -1, 130, 58, -1, 152, 235, -1, 110, 142, - -1, 196, -1, -1, 196, 197, -1, 197, -1, 48, - 142, -1, 51, 142, -1, 123, 142, -1, 125, 142, - -1, 134, 142, -1, 27, 142, -1, 130, 58, -1, - 149, 199, -1, 199, 200, -1, 200, -1, 19, 58, - -1, 45, 58, -1, 21, 240, -1, 111, 58, -1, - 89, 241, -1, 84, 241, -1, 87, 241, -1, 82, - 241, -1, 92, 58, -1, 11, 58, -1, 136, 202, - -1, 138, 142, -1, 39, 203, 204, -1, 202, 203, - -1, 203, -1, 20, -1, 24, -1, 76, -1, 114, - -1, 126, -1, 143, -1, 147, -1, 122, -1, 204, - 205, -1, 205, -1, 38, 142, -1, 154, 206, -1, - 72, -1, 99, -1, 35, -1, 28, -1, 101, -1, - 116, -1, 25, -1, 159, -1, 95, -1, 162, -1, - 3, -1, 29, 210, -1, 96, 212, -1, 129, 187, - 208, -1, 129, 188, 80, 188, 208, -1, 129, 26, - 208, -1, 129, 61, 26, 208, -1, 129, 63, 26, - 208, -1, 129, 135, 208, -1, -1, 208, 209, -1, - 44, -1, 52, -1, 68, -1, 69, -1, 71, -1, - 77, -1, 100, -1, 102, -1, 103, -1, 105, -1, - 106, -1, 107, -1, 109, -1, 157, -1, 210, 211, - -1, 211, -1, 9, 58, -1, 90, 58, -1, 94, - 58, -1, 212, 213, -1, 213, -1, 53, 58, -1, - 54, 58, -1, 55, 58, -1, 56, 58, -1, 81, - 58, -1, 83, 58, -1, 85, 58, -1, 88, 58, - -1, 47, 187, 215, -1, 215, 216, -1, 216, -1, - 145, 241, -1, 146, 241, -1, 141, 58, -1, 127, - 142, -1, 40, 240, -1, 41, 240, -1, 42, 240, - -1, 43, 240, -1, 35, 218, -1, 28, 218, -1, - 218, 219, -1, 219, -1, 6, -1, 10, -1, 17, - -1, 64, -1, 94, -1, 108, -1, 137, -1, 148, - 221, -1, 221, 222, -1, 222, -1, 5, 241, -1, - 30, 241, -1, 46, 241, -1, 49, 241, -1, 112, - 241, -1, 139, 241, -1, 140, 241, -1, 230, -1, - 57, 142, 184, -1, 36, -1, 15, 241, -1, 18, - 58, -1, 144, 241, -1, 32, 224, -1, 70, 142, - -1, 117, 142, -1, 75, 142, -1, 74, 228, -1, - 115, 238, -1, 131, 142, -1, 133, 225, -1, 150, - 188, -1, 150, 188, 226, -1, 153, 234, -1, 124, - 142, -1, 142, -1, 142, 31, -1, -1, 142, 176, - 142, 26, -1, 142, 176, 142, -1, 226, 227, -1, - 227, -1, 119, 58, -1, 59, 188, -1, 228, 229, - -1, 229, -1, 142, -1, 231, 233, 232, -1, 231, - 233, 142, -1, 59, -1, 98, -1, 4, -1, 60, - -1, 62, -1, 160, -1, 73, -1, 52, -1, 33, - -1, 234, 58, -1, 58, -1, 235, 236, -1, 236, - -1, 58, -1, 237, -1, 177, 58, 34, 58, 178, - -1, 238, 142, -1, 142, -1, 239, 187, -1, 187, - -1, 58, -1, 151, -1, 37, -1, 58, -1, 31, - -1, 243, 179, 244, 246, 180, -1, 166, -1, 244, - 245, 165, -1, 245, 165, -1, 167, 176, 241, -1, - 168, 176, 241, -1, 246, 247, -1, 247, -1, 249, - 179, 248, 250, 180, -1, 169, 176, 241, 165, -1, - 132, 176, 187, -1, 250, 251, -1, 251, -1, 170, - 176, 241, 179, 252, 180, -1, 252, 253, 165, -1, - 253, 165, -1, 171, 176, 241, -1, 172, 176, 241, - -1, 173, 176, 241, -1, 174, 176, 241, -1, 175, - 176, 241, -1 + 104, -1, 121, -1, 122, -1, 152, -1, 162, -1, + 154, 58, -1, 93, 58, -1, 158, 58, -1, 193, + 188, -1, 156, -1, 157, -1, 14, -1, 79, 240, + -1, 97, 240, -1, 8, 58, -1, 22, 58, -1, + 23, 196, -1, 66, 143, -1, 67, 143, -1, 129, + 58, -1, 131, 58, -1, 153, 236, -1, 110, 143, + -1, 197, -1, -1, 197, 198, -1, 198, -1, 48, + 143, -1, 51, 143, -1, 124, 143, -1, 126, 143, + -1, 135, 143, -1, 27, 143, -1, 131, 58, -1, + 150, 200, -1, 200, 201, -1, 201, -1, 19, 58, + -1, 45, 58, -1, 21, 241, -1, 111, 58, -1, + 112, 58, -1, 89, 242, -1, 84, 242, -1, 87, + 242, -1, 82, 242, -1, 92, 58, -1, 11, 58, + -1, 137, 203, -1, 139, 143, -1, 39, 204, 205, + -1, 203, 204, -1, 204, -1, 20, -1, 24, -1, + 76, -1, 115, -1, 127, -1, 144, -1, 148, -1, + 123, -1, 205, 206, -1, 206, -1, 38, 143, -1, + 155, 207, -1, 72, -1, 99, -1, 35, -1, 28, + -1, 101, -1, 117, -1, 25, -1, 160, -1, 95, + -1, 163, -1, 3, -1, 29, 211, -1, 96, 213, + -1, 130, 188, 209, -1, 130, 189, 80, 189, 209, + -1, 130, 26, 209, -1, 130, 61, 26, 209, -1, + 130, 63, 26, 209, -1, 130, 136, 209, -1, -1, + 209, 210, -1, 44, -1, 52, -1, 68, -1, 69, + -1, 71, -1, 77, -1, 100, -1, 102, -1, 103, + -1, 105, -1, 106, -1, 107, -1, 109, -1, 158, + -1, 211, 212, -1, 212, -1, 9, 58, -1, 90, + 58, -1, 94, 58, -1, 213, 214, -1, 214, -1, + 53, 58, -1, 54, 58, -1, 55, 58, -1, 56, + 58, -1, 81, 58, -1, 83, 58, -1, 85, 58, + -1, 88, 58, -1, 47, 188, 216, -1, 216, 217, + -1, 217, -1, 146, 242, -1, 147, 242, -1, 142, + 58, -1, 128, 143, -1, 40, 241, -1, 41, 241, + -1, 42, 241, -1, 43, 241, -1, 35, 219, -1, + 28, 219, -1, 219, 220, -1, 220, -1, 6, -1, + 10, -1, 17, -1, 64, -1, 94, -1, 108, -1, + 138, -1, 149, 222, -1, 222, 223, -1, 223, -1, + 5, 242, -1, 30, 242, -1, 46, 242, -1, 49, + 242, -1, 113, 242, -1, 140, 242, -1, 141, 242, + -1, 231, -1, 57, 143, 185, -1, 36, -1, 15, + 242, -1, 18, 58, -1, 145, 242, -1, 32, 225, + -1, 70, 143, -1, 118, 143, -1, 75, 143, -1, + 74, 229, -1, 116, 239, -1, 132, 143, -1, 134, + 226, -1, 151, 189, -1, 151, 189, 227, -1, 154, + 235, -1, 125, 143, -1, 143, -1, 143, 31, -1, + -1, 143, 177, 143, 26, -1, 143, 177, 143, -1, + 227, 228, -1, 228, -1, 120, 58, -1, 59, 189, + -1, 229, 230, -1, 230, -1, 143, -1, 232, 234, + 233, -1, 232, 234, 143, -1, 59, -1, 98, -1, + 4, -1, 60, -1, 62, -1, 161, -1, 73, -1, + 52, -1, 33, -1, 235, 58, -1, 58, -1, 236, + 237, -1, 237, -1, 58, -1, 238, -1, 178, 58, + 34, 58, 179, -1, 239, 143, -1, 143, -1, 240, + 188, -1, 188, -1, 58, -1, 152, -1, 37, -1, + 58, -1, 31, -1, 244, 180, 245, 247, 181, -1, + 167, -1, 245, 246, 166, -1, 246, 166, -1, 168, + 177, 242, -1, 169, 177, 242, -1, 247, 248, -1, + 248, -1, 250, 180, 249, 251, 181, -1, 170, 177, + 242, 166, -1, 133, 177, 188, -1, 251, 252, -1, + 252, -1, 171, 177, 242, 180, 253, 181, -1, 253, + 254, 166, -1, 254, 166, -1, 172, 177, 242, -1, + 173, 177, 242, -1, 174, 177, 242, -1, 175, 177, + 242, -1, 176, 177, 242, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 312, 312, 316, 317, 318, 332, 333, 334, 335, - 336, 337, 338, 339, 340, 341, 342, 343, 344, 352, - 358, 367, 368, 369, 370, 371, 375, 376, 377, 381, - 385, 386, 390, 391, 392, 393, 394, 395, 396, 397, - 398, 399, 400, 401, 402, 403, 404, 413, 421, 422, - 432, 434, 436, 447, 449, 451, 456, 458, 460, 462, - 464, 466, 471, 473, 477, 484, 494, 496, 498, 500, - 502, 504, 506, 523, 528, 529, 533, 535, 537, 539, - 541, 543, 545, 547, 549, 551, 561, 563, 572, 580, - 581, 585, 586, 587, 588, 589, 590, 591, 592, 596, - 603, 613, 623, 632, 641, 650, 651, 655, 656, 657, - 658, 659, 660, 661, 670, 674, 678, 683, 688, 693, - 706, 719, 731, 732, 737, 738, 739, 740, 741, 742, - 743, 744, 745, 746, 747, 748, 749, 750, 754, 756, - 761, 762, 763, 767, 769, 774, 775, 776, 777, 778, - 779, 780, 781, 789, 794, 796, 801, 802, 803, 804, - 805, 806, 807, 808, 816, 818, 823, 830, 840, 841, - 842, 843, 844, 845, 846, 862, 866, 867, 871, 872, - 873, 874, 875, 876, 877, 886, 887, 903, 909, 911, - 913, 915, 917, 920, 922, 933, 935, 937, 947, 949, - 951, 953, 955, 960, 962, 966, 970, 972, 977, 979, - 983, 984, 988, 989, 993, 1008, 1013, 1021, 1022, 1026, - 1027, 1028, 1029, 1033, 1034, 1035, 1045, 1046, 1050, 1052, - 1057, 1059, 1063, 1068, 1069, 1073, 1074, 1078, 1087, 1088, - 1092, 1093, 1102, 1117, 1121, 1122, 1126, 1127, 1131, 1132, - 1136, 1141, 1145, 1149, 1150, 1154, 1159, 1160, 1164, 1166, - 1168, 1170, 1172 + 0, 313, 313, 317, 318, 319, 333, 334, 335, 336, + 337, 338, 339, 340, 341, 342, 343, 344, 345, 353, + 359, 368, 369, 370, 371, 372, 376, 377, 378, 382, + 386, 387, 391, 392, 393, 394, 395, 396, 397, 398, + 399, 400, 401, 402, 403, 404, 405, 414, 422, 423, + 433, 435, 437, 448, 450, 452, 457, 459, 461, 463, + 465, 467, 472, 474, 478, 485, 495, 497, 499, 501, + 503, 505, 507, 524, 529, 530, 534, 536, 538, 540, + 542, 544, 546, 548, 550, 552, 554, 564, 566, 575, + 583, 584, 588, 589, 590, 591, 592, 593, 594, 595, + 599, 606, 616, 626, 635, 644, 653, 654, 658, 659, + 660, 661, 662, 663, 664, 673, 677, 681, 686, 691, + 696, 709, 722, 734, 735, 740, 741, 742, 743, 744, + 745, 746, 747, 748, 749, 750, 751, 752, 753, 757, + 759, 764, 765, 766, 770, 772, 777, 778, 779, 780, + 781, 782, 783, 784, 792, 797, 799, 804, 805, 806, + 807, 808, 809, 810, 811, 819, 821, 826, 833, 843, + 844, 845, 846, 847, 848, 849, 865, 869, 870, 874, + 875, 876, 877, 878, 879, 880, 889, 890, 906, 912, + 914, 916, 918, 920, 923, 925, 936, 938, 940, 950, + 952, 954, 956, 958, 963, 965, 969, 973, 975, 980, + 982, 986, 987, 991, 992, 996, 1011, 1016, 1024, 1025, + 1029, 1030, 1031, 1032, 1036, 1037, 1038, 1048, 1049, 1053, + 1055, 1060, 1062, 1066, 1071, 1072, 1076, 1077, 1081, 1090, + 1091, 1095, 1096, 1105, 1120, 1124, 1125, 1129, 1130, 1134, + 1135, 1139, 1144, 1148, 1152, 1153, 1157, 1162, 1163, 1167, + 1169, 1171, 1173, 1175 }; #endif @@ -970,9 +972,9 @@ static const char *const yytname[] = "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", - "T_Panic", "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", - "T_Pool", "T_Port", "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", - "T_Qos", "T_Randfile", "T_Rawstats", "T_Refid", "T_Requestkey", + "T_Orphanwait", "T_Panic", "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", + "T_Pidfile", "T_Pool", "T_Port", "T_Preempt", "T_Prefer", "T_Protostats", + "T_Pw", "T_Qos", "T_Randfile", "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke", "T_Saveconfigdir", "T_Server", "T_Setvar", "T_Sign", "T_Source", "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", "T_Sysstats", "T_Tick", "T_Time1", @@ -1028,41 +1030,41 @@ static const yytype_uint16 yytoknum[] = 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, - 425, 426, 427, 428, 429, 430, 61, 40, 41, 123, - 125 + 425, 426, 427, 428, 429, 430, 431, 61, 40, 41, + 123, 125 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 181, 182, 183, 183, 183, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 185, - 185, 186, 186, 186, 186, 186, 187, 187, 187, 188, - 189, 189, 190, 190, 190, 190, 190, 190, 190, 190, - 190, 190, 190, 190, 190, 190, 190, 191, 192, 192, - 193, 193, 193, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 195, 195, 196, 196, 197, 197, 197, 197, - 197, 197, 197, 198, 199, 199, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 201, 201, 201, 202, - 202, 203, 203, 203, 203, 203, 203, 203, 203, 204, - 204, 205, 205, 205, 205, 205, 205, 206, 206, 206, - 206, 206, 206, 206, 207, 207, 207, 207, 207, 207, - 207, 207, 208, 208, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 209, 209, 209, 210, 210, - 211, 211, 211, 212, 212, 213, 213, 213, 213, 213, - 213, 213, 213, 214, 215, 215, 216, 216, 216, 216, - 216, 216, 216, 216, 217, 217, 218, 218, 219, 219, - 219, 219, 219, 219, 219, 220, 221, 221, 222, 222, - 222, 222, 222, 222, 222, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 224, 224, 224, 225, 225, 226, 226, - 227, 227, 228, 228, 229, 230, 230, 231, 231, 232, - 232, 232, 232, 233, 233, 233, 234, 234, 235, 235, - 236, 236, 237, 238, 238, 239, 239, 240, 240, 240, - 241, 241, 242, 243, 244, 244, 245, 245, 246, 246, - 247, 248, 249, 250, 250, 251, 252, 252, 253, 253, - 253, 253, 253 + 0, 182, 183, 184, 184, 184, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 186, + 186, 187, 187, 187, 187, 187, 188, 188, 188, 189, + 190, 190, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 191, 191, 191, 191, 191, 192, 193, 193, + 194, 194, 194, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 196, 196, 197, 197, 198, 198, 198, 198, + 198, 198, 198, 199, 200, 200, 201, 201, 201, 201, + 201, 201, 201, 201, 201, 201, 201, 202, 202, 202, + 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, + 205, 205, 206, 206, 206, 206, 206, 206, 207, 207, + 207, 207, 207, 207, 207, 208, 208, 208, 208, 208, + 208, 208, 208, 209, 209, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 211, + 211, 212, 212, 212, 213, 213, 214, 214, 214, 214, + 214, 214, 214, 214, 215, 216, 216, 217, 217, 217, + 217, 217, 217, 217, 217, 218, 218, 219, 219, 220, + 220, 220, 220, 220, 220, 220, 221, 222, 222, 223, + 223, 223, 223, 223, 223, 223, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 225, 225, 225, 226, 226, 227, + 227, 228, 228, 229, 229, 230, 231, 231, 232, 232, + 233, 233, 233, 233, 234, 234, 234, 235, 235, 236, + 236, 237, 237, 238, 239, 239, 240, 240, 241, 241, + 241, 242, 242, 243, 244, 245, 245, 246, 246, 247, + 247, 248, 249, 250, 251, 251, 252, 253, 253, 254, + 254, 254, 254, 254 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1076,25 +1078,25 @@ 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, 2, 1, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 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, 2, 3, 5, 3, + 4, 4, 3, 0, 2, 1, 1, 1, 1, 1, 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, 2, 3, 5, 3, 4, - 4, 3, 0, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, - 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, + 1, 2, 2, 2, 2, 1, 2, 2, 2, 2, + 2, 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, - 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, - 1, 1, 5, 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, 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, 1, 1, 5, 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 @@ -1103,60 +1105,60 @@ static const yytype_uint8 yyr2[] = static const yytype_uint16 yydefact[] = { 0, 0, 0, 24, 50, 0, 0, 0, 63, 0, - 0, 205, 0, 187, 0, 0, 0, 217, 0, 0, - 0, 0, 0, 25, 0, 0, 0, 218, 0, 23, + 0, 206, 0, 188, 0, 0, 0, 218, 0, 0, + 0, 0, 0, 25, 0, 0, 0, 219, 0, 23, 0, 0, 22, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 49, - 243, 0, 2, 0, 7, 0, 8, 0, 9, 10, - 13, 11, 12, 14, 15, 16, 17, 185, 0, 18, - 0, 5, 53, 241, 240, 188, 189, 54, 0, 0, - 0, 0, 0, 0, 0, 55, 62, 65, 168, 169, - 170, 171, 172, 173, 174, 165, 167, 0, 0, 0, - 114, 139, 203, 191, 164, 91, 92, 93, 94, 98, - 95, 96, 97, 0, 0, 0, 29, 0, 26, 6, - 56, 57, 192, 214, 195, 213, 194, 236, 51, 0, - 0, 0, 0, 0, 0, 0, 0, 115, 144, 52, - 61, 234, 196, 193, 202, 58, 122, 0, 0, 122, - 122, 26, 59, 197, 0, 198, 86, 90, 87, 190, - 0, 0, 0, 0, 0, 0, 0, 175, 177, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 75, 199, 230, 0, 60, 229, 231, 227, 201, 1, - 0, 4, 20, 47, 225, 224, 223, 0, 0, 71, - 66, 67, 68, 69, 72, 70, 64, 166, 140, 141, - 142, 138, 204, 106, 105, 0, 103, 104, 0, 88, - 100, 27, 28, 0, 0, 0, 0, 0, 0, 0, - 0, 153, 155, 186, 212, 235, 145, 146, 147, 148, - 149, 150, 151, 152, 143, 233, 118, 122, 122, 121, - 116, 0, 0, 89, 178, 179, 180, 181, 182, 183, - 184, 176, 85, 76, 239, 237, 238, 78, 77, 83, - 81, 82, 80, 84, 79, 74, 0, 0, 200, 209, - 0, 228, 226, 3, 32, 0, 34, 35, 0, 0, - 0, 0, 39, 40, 41, 42, 0, 0, 43, 19, - 31, 219, 220, 221, 216, 222, 215, 0, 0, 0, - 0, 101, 113, 109, 111, 107, 108, 110, 112, 102, - 99, 160, 161, 162, 163, 159, 158, 156, 157, 154, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 123, 119, 120, 122, 207, 211, - 210, 208, 0, 33, 36, 38, 37, 45, 44, 46, - 30, 0, 0, 0, 0, 0, 249, 0, 245, 117, - 206, 0, 246, 247, 0, 244, 242, 248, 0, 232, - 252, 0, 0, 0, 0, 0, 254, 0, 0, 250, - 253, 251, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 255, 0, 257, 258, - 259, 260, 261, 262, 256 + 244, 0, 2, 0, 7, 0, 8, 0, 9, 10, + 13, 11, 12, 14, 15, 16, 17, 186, 0, 18, + 0, 5, 53, 242, 241, 189, 190, 54, 0, 0, + 0, 0, 0, 0, 0, 55, 62, 65, 169, 170, + 171, 172, 173, 174, 175, 166, 168, 0, 0, 0, + 115, 140, 204, 192, 165, 92, 93, 94, 95, 99, + 96, 97, 98, 0, 0, 0, 29, 0, 26, 6, + 56, 57, 193, 215, 196, 214, 195, 237, 51, 0, + 0, 0, 0, 0, 0, 0, 0, 116, 145, 52, + 61, 235, 197, 194, 203, 58, 123, 0, 0, 123, + 123, 26, 59, 198, 0, 199, 87, 91, 88, 191, + 0, 0, 0, 0, 0, 0, 0, 176, 178, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 73, 75, 200, 231, 0, 60, 230, 232, 228, 202, + 1, 0, 4, 20, 47, 226, 225, 224, 0, 0, + 71, 66, 67, 68, 69, 72, 70, 64, 167, 141, + 142, 143, 139, 205, 107, 106, 0, 104, 105, 0, + 89, 101, 27, 28, 0, 0, 0, 0, 0, 0, + 0, 0, 154, 156, 187, 213, 236, 146, 147, 148, + 149, 150, 151, 152, 153, 144, 234, 119, 123, 123, + 122, 117, 0, 0, 90, 179, 180, 181, 182, 183, + 184, 185, 177, 86, 76, 240, 238, 239, 78, 77, + 84, 82, 83, 81, 85, 79, 80, 74, 0, 0, + 201, 210, 0, 229, 227, 3, 32, 0, 34, 35, + 0, 0, 0, 0, 39, 40, 41, 42, 0, 0, + 43, 19, 31, 220, 221, 222, 217, 223, 216, 0, + 0, 0, 0, 102, 114, 110, 112, 108, 109, 111, + 113, 103, 100, 161, 162, 163, 164, 160, 159, 157, + 158, 155, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 124, 120, 121, 123, + 208, 212, 211, 209, 0, 33, 36, 38, 37, 45, + 44, 46, 30, 0, 0, 0, 0, 0, 250, 0, + 246, 118, 207, 0, 247, 248, 0, 245, 243, 249, + 0, 233, 253, 0, 0, 0, 0, 0, 255, 0, + 0, 251, 254, 252, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 256, 0, + 258, 259, 260, 261, 262, 263, 257 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 51, 52, 53, 54, 55, 127, 118, 299, 300, - 56, 57, 58, 59, 85, 86, 87, 60, 179, 180, - 61, 156, 113, 219, 220, 319, 62, 246, 344, 100, - 101, 137, 138, 63, 231, 232, 64, 95, 96, 65, - 167, 168, 66, 103, 155, 278, 279, 124, 125, 67, - 68, 306, 197, 188, 184, 185, 186, 142, 128, 267, - 75, 69, 70, 309, 310, 365, 366, 382, 367, 385, - 386, 399, 400 + -1, 51, 52, 53, 54, 55, 127, 118, 301, 302, + 56, 57, 58, 59, 85, 86, 87, 60, 180, 181, + 61, 156, 113, 220, 221, 321, 62, 247, 346, 100, + 101, 137, 138, 63, 232, 233, 64, 95, 96, 65, + 167, 168, 66, 103, 155, 280, 281, 124, 125, 67, + 68, 308, 198, 189, 185, 186, 187, 142, 128, 268, + 75, 69, 70, 311, 312, 367, 368, 384, 369, 387, + 388, 401, 402 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing @@ -1164,61 +1166,61 @@ static const yytype_int16 yydefgoto[] = #define YYPACT_NINF -148 static const yytype_int16 yypact[] = { - 136, -128, -27, -148, -148, -8, -11, 3, 153, 19, - -1, -97, 19, -148, 31, -43, -84, -148, -83, -80, - -79, -72, -70, -148, -43, -14, -43, -148, -66, -148, - -65, -64, -148, -63, 23, 34, 24, -52, -148, -50, - 31, -48, -8, 0, 216, -33, -51, 33, -148, -148, - -148, 98, 308, -57, -148, -43, -148, -43, -148, -148, - -148, -148, -148, -148, -148, -148, -148, -148, -9, -148, - -69, -148, -148, -148, -148, -148, -148, -148, -31, -28, - -26, 4, 5, 57, 10, -148, 153, -148, -148, -148, - -148, -148, -148, -148, -148, 19, -148, 70, 84, 85, - -1, -148, 124, -148, 19, -148, -148, -148, -148, -148, - -148, -148, -148, -19, 20, 25, -148, 183, -148, 454, - -148, -148, -148, -148, -72, -148, -148, -148, -43, 103, - 112, 115, 119, 121, 123, 126, 127, -14, -148, -43, - -148, -148, 40, -148, -148, -148, -148, -13, -12, -148, - -148, 106, -148, -148, 13, -148, 31, -148, -148, -148, - -8, -8, -8, -8, -8, -8, -8, 0, -148, 132, - 133, -10, 134, -8, -8, -8, -8, 138, 139, 216, - -148, -44, -148, 140, -51, -148, -148, -148, 141, -148, - 29, -148, 530, -148, -148, -148, -148, 6, -134, -148, + 137, -132, -20, -148, -148, -7, -17, -16, 44, -1, + 9, -99, -1, -148, 115, -46, -98, -148, -97, -95, + -94, -90, -88, -148, -46, 144, -46, -148, -85, -148, + -84, -78, -148, -77, -2, 13, 12, -71, -148, -70, + 115, -66, -7, 1, 538, -65, -51, 32, -148, -148, + -148, 91, 310, -68, -148, -46, -148, -46, -148, -148, + -148, -148, -148, -148, -148, -148, -148, -148, -12, -148, + -80, -148, -148, -148, -148, -148, -148, -148, -47, -39, + -38, -28, -27, 55, -26, -148, 44, -148, -148, -148, + -148, -148, -148, -148, -148, -1, -148, 71, 72, 86, + 9, -148, 117, -148, -1, -148, -148, -148, -148, -148, + -148, -148, -148, -15, 10, 14, -148, 39, -148, 457, + -148, -148, -148, -148, -90, -148, -148, -148, -46, 96, + 104, 105, 106, 119, 120, 122, 124, 144, -148, -46, + -148, -148, 40, -148, -148, -148, -148, 3, 4, -148, + -148, 107, -148, -148, 15, -148, 115, -148, -148, -148, + -7, -7, -7, -7, -7, -7, -7, 1, -148, 132, + 135, 6, 143, -7, -7, -7, -7, 147, 148, 150, + 538, -148, -37, -148, 151, -51, -148, -148, -148, 152, + -148, 29, -148, 530, -148, -148, -148, -148, 0, -142, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, 63, -148, -148, 1, -19, - -148, -148, -148, -10, -10, -10, -10, 65, 150, -8, - -8, 183, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, 556, -148, -148, 556, - 556, -33, 67, -148, -148, -148, -148, -148, -148, -148, + -148, -148, -148, -148, -148, -148, 70, -148, -148, 11, + -15, -148, -148, -148, 6, 6, 6, 6, 74, 156, + -7, -7, 39, -148, -148, -148, -148, -148, -148, -148, + -148, -148, -148, -148, -148, -148, -148, 560, -148, -148, + 560, 560, -65, 81, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, -148, -33, 154, -44, -148, - 179, -148, -148, -148, -148, -8, -148, -148, 158, 160, - 161, 162, -148, -148, -148, -148, 163, 164, -148, 530, - -148, -148, -148, -148, -148, -148, -148, 52, 53, -111, - 66, -148, -148, -148, -148, -148, -148, -148, -148, -148, + -148, -148, -148, -148, -148, -148, -148, -148, -65, 168, + -37, -148, 194, -148, -148, -148, -148, -7, -148, -148, + 173, 178, 179, 181, -148, -148, -148, -148, 182, 183, + -148, 530, -148, -148, -148, -148, -148, -148, -148, 66, + 69, -100, 82, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, -148, - -148, -148, -148, -148, -148, 556, 556, -148, 204, -148, - -148, -148, 178, -148, -148, -148, -148, -148, -148, -148, - -148, -8, -8, 62, 74, -115, -148, 61, -148, 556, - -148, 69, -148, -148, -43, -148, -148, -148, 72, -148, - -148, 68, 75, -8, 76, -142, -148, 83, -8, -148, - -148, -148, 71, -87, 79, 80, 81, 82, 86, 177, - 94, -8, -8, -8, -8, -8, -148, 105, -148, -148, - -148, -148, -148, -148, -148 + -148, -148, -148, -148, -148, -148, -148, 560, 560, -148, + 223, -148, -148, -148, 192, -148, -148, -148, -148, -148, + -148, -148, -148, -7, -7, 75, 88, -114, -148, 77, + -148, 560, -148, 79, -148, -148, -46, -148, -148, -148, + 90, -148, -148, 84, 93, -7, 95, -146, -148, 99, + -7, -148, -148, -148, 97, 47, 98, 101, 102, 103, + 108, -87, 118, -7, -7, -7, -7, -7, -148, 123, + -148, -148, -148, -148, -148, -148, -148 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -148, -148, -148, -46, -148, -148, -3, -34, -148, -36, - -148, -148, -148, -148, -148, -148, 185, -148, -148, 96, - -148, -148, -18, -148, 54, -148, -148, -147, -148, -148, - 181, -148, 142, -148, -148, 46, -148, 270, -60, -148, - -148, 128, -148, -148, -148, -148, 12, -148, 169, -148, - -148, -148, -148, -148, -148, 110, -148, -148, 271, -120, - -42, -148, -148, -148, -5, -148, -59, -148, -148, -148, - -89, -148, -100 + -148, -148, -148, -44, -148, -148, -3, -34, -148, -18, + -148, -148, -148, -148, -148, -148, 187, -148, -148, 112, + -148, -148, -30, -148, 61, -148, -148, -147, -148, -148, + 195, -148, 159, -148, -148, 65, -148, 286, -67, -148, + -148, 133, -148, -148, -148, -148, 19, -148, 177, -148, + -148, -148, -148, -148, -148, 121, -148, -148, 276, -116, + -42, -148, -148, -148, -6, -148, -60, -148, -148, -148, + -79, -148, -92 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1228,154 +1230,154 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 159, 151, 249, 250, 312, 160, 190, 182, 97, 213, - 301, 181, 117, 247, 248, 276, 214, 363, 114, 215, - 115, 363, 157, 73, 194, 88, 313, 264, 384, 89, - 161, 72, 150, 307, 308, 207, 90, 71, 389, 129, - 130, 131, 132, 195, 207, 102, 162, 76, 265, 163, - 74, 105, 192, 216, 193, 106, 307, 308, 119, 120, - 146, 77, 121, 122, 196, 376, 302, 133, 303, 134, - 123, 135, 126, 233, 136, 277, 140, 141, 143, 144, - 217, 145, 152, 91, 394, 395, 396, 397, 398, 98, - 153, 187, 154, 99, 158, 147, 314, 148, 189, 116, - 345, 346, 315, 321, 322, 323, 324, 107, 191, 116, - 198, 199, 164, 92, 200, 204, 201, 316, 254, 255, - 256, 257, 258, 259, 260, 235, 183, 93, 208, 221, - 222, 269, 270, 271, 272, 218, 235, 1, 253, 165, - 166, 266, 209, 210, 2, 108, 202, 203, 304, 3, - 4, 5, 205, 109, 6, 212, 94, 110, 7, 8, - 317, 236, 221, 318, 9, 10, 305, 222, 11, 149, - 237, 12, 13, 238, 111, 14, 116, 239, 112, 240, - 78, 241, 245, 15, 242, 243, 251, 327, 328, 252, - 262, 263, 268, 16, 283, 17, 273, 274, 280, 282, - 369, 79, 18, 19, 80, 311, 20, 325, 326, 348, - 21, 22, 350, 352, 23, 24, 354, 347, 355, 356, - 357, 358, 359, 223, 224, 225, 226, 169, 361, 362, - 370, 368, 25, 26, 27, 170, 371, 171, 374, 375, - 378, 381, 349, 353, 383, 384, 28, 379, 391, 29, - 393, 30, 388, 31, 32, 401, 402, 403, 404, 408, - 33, 172, 405, 360, 34, 35, 36, 37, 38, 39, - 414, 206, 40, 320, 41, 275, 81, 329, 82, 244, - 42, 211, 104, 83, 43, 44, 45, 84, 46, 47, - 351, 48, 49, 234, 281, 261, 390, 139, 173, 407, - 174, -6, 50, 175, 364, 176, 377, 0, 177, 0, - 227, 0, 0, 0, 0, 0, 2, 0, 0, 372, - 373, 3, 4, 5, 228, 0, 6, 178, 229, 230, - 7, 8, 0, 0, 0, 0, 9, 10, 0, 0, - 11, 387, 0, 12, 13, 0, 392, 14, 394, 395, - 396, 397, 398, 0, 0, 15, 0, 406, 0, 409, - 410, 411, 412, 413, 0, 16, 0, 17, 0, 0, - 0, 380, 0, 0, 18, 19, 0, 0, 20, 0, - 0, 0, 21, 22, 0, 0, 23, 24, 0, 0, + 159, 151, 250, 251, 303, 88, 160, 183, 191, 89, + 157, 182, 117, 214, 314, 114, 90, 115, 97, 365, + 215, 195, 278, 216, 73, 386, 309, 310, 208, 248, + 249, 161, 150, 365, 71, 391, 315, 208, 72, 146, + 196, 76, 77, 265, 102, 119, 120, 162, 121, 122, + 163, 74, 193, 123, 194, 126, 145, 217, 140, 141, + 304, 197, 305, 91, 266, 143, 144, 378, 309, 310, + 152, 78, 153, 154, 147, 234, 148, 158, 116, 224, + 225, 226, 227, 279, 218, 396, 397, 398, 399, 400, + 188, 190, 79, 92, 408, 80, 200, 116, 192, 98, + 199, 347, 348, 99, 201, 202, 316, 93, 323, 324, + 325, 326, 317, 205, 164, 203, 204, 206, 255, 256, + 257, 258, 259, 260, 261, 236, 254, 184, 318, 209, + 210, 270, 271, 272, 273, 105, 236, 94, 1, 106, + 219, 165, 166, 306, 211, 2, 222, 223, 213, 149, + 3, 4, 5, 222, 237, 6, 116, 223, 267, 7, + 8, 307, 238, 239, 240, 9, 10, 228, 81, 11, + 82, 319, 12, 13, 320, 83, 14, 241, 242, 84, + 243, 229, 244, 246, 15, 230, 231, 252, 329, 330, + 263, 107, 253, 264, 16, 285, 17, 129, 130, 131, + 132, 269, 371, 18, 19, 274, 275, 20, 276, 282, + 284, 21, 22, 313, 328, 23, 24, 327, 349, 396, + 397, 398, 399, 400, 350, 133, 352, 134, 354, 135, + 108, 356, 136, 25, 26, 27, 357, 358, 109, 359, + 360, 361, 110, 363, 351, 355, 364, 28, 370, 372, + 373, 29, 376, 30, 377, 31, 32, 380, 381, 111, + 383, 385, 33, 112, 386, 393, 34, 35, 36, 37, + 38, 39, 390, 207, 40, 403, 41, 395, 404, 405, + 406, 322, 42, 362, 410, 407, 43, 44, 45, 416, + 46, 47, 277, 48, 49, 212, 245, 331, 104, 353, + 262, 235, 139, -6, 50, 366, 283, 379, 392, 409, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 374, 375, 3, 4, 5, 0, 0, 6, 0, + 0, 0, 7, 8, 0, 0, 0, 0, 9, 10, + 0, 0, 11, 389, 0, 12, 13, 0, 394, 14, + 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, + 0, 411, 412, 413, 414, 415, 0, 16, 0, 17, + 0, 0, 0, 382, 0, 0, 18, 19, 0, 0, + 20, 0, 0, 0, 21, 22, 0, 0, 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, - 0, 29, 0, 30, 0, 31, 32, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 34, 35, 36, 37, - 38, 39, 0, 0, 40, 0, 41, 0, 0, 0, - 0, 0, 42, 0, 0, 0, 43, 44, 45, 0, - 46, 47, 2, 48, 49, 0, 0, 3, 4, 5, - 0, 0, 6, -6, 50, 0, 7, 8, 0, 0, - 0, 0, 9, 10, 0, 0, 11, 0, 0, 12, - 13, 0, 0, 14, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 0, 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, 0, 284, 0, 0, - 0, 0, 285, 0, 0, 0, 286, 0, 0, 0, - 25, 26, 27, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 28, 0, 0, 29, 0, 30, - 0, 31, 32, 0, 0, 0, 0, 0, 33, 0, - 287, 0, 34, 35, 36, 37, 38, 39, 0, 0, - 40, 0, 41, 0, 0, 288, 0, 0, 42, 0, - 330, 0, 43, 44, 45, 0, 46, 47, 331, 48, - 49, 0, 0, 0, 0, 0, 289, 0, 0, 0, - 50, 290, 0, 291, 332, 333, 0, 334, 0, 0, - 0, 0, 0, 335, 292, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 25, 26, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 293, 294, 0, 0, 0, 0, 336, 0, 337, 338, - 0, 339, 340, 341, 0, 342, 0, 0, 0, 0, + 28, 0, 0, 0, 29, 0, 30, 0, 31, 32, + 0, 0, 0, 0, 0, 33, 0, 0, 0, 34, + 35, 36, 37, 38, 39, 0, 0, 40, 0, 41, + 0, 0, 0, 0, 0, 42, 0, 0, 0, 43, + 44, 45, 0, 46, 47, 2, 48, 49, 0, 0, + 3, 4, 5, 0, 0, 6, -6, 50, 0, 7, + 8, 0, 0, 0, 0, 9, 10, 0, 0, 11, + 0, 0, 12, 13, 0, 0, 14, 0, 0, 0, + 0, 0, 0, 0, 15, 0, 0, 0, 0, 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, 286, 0, 0, + 0, 0, 287, 0, 0, 0, 288, 0, 0, 169, + 0, 0, 0, 25, 26, 27, 0, 170, 0, 171, + 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, + 0, 29, 0, 30, 0, 31, 32, 0, 0, 0, + 289, 0, 33, 172, 0, 0, 34, 35, 36, 37, + 38, 39, 0, 0, 40, 290, 41, 0, 0, 0, + 0, 0, 42, 0, 332, 0, 43, 44, 45, 0, + 46, 47, 333, 48, 49, 0, 291, 0, 0, 0, + 173, 292, 174, 293, 50, 175, 0, 176, 334, 335, + 177, 336, 0, 0, 294, 0, 0, 337, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 178, + 179, 295, 296, 0, 0, 0, 0, 0, 0, 0, + 338, 0, 339, 340, 0, 341, 342, 343, 0, 344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 295, 0, 296, 0, 0, 0, 297, 0, 0, - 0, 298, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 297, 0, 298, 0, 0, 0, 299, 0, + 0, 0, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 343 + 0, 0, 0, 0, 0, 0, 0, 0, 345 }; static const yytype_int16 yycheck[] = { - 42, 35, 149, 150, 3, 5, 52, 58, 9, 28, - 4, 45, 15, 26, 26, 59, 35, 132, 61, 38, - 63, 132, 40, 31, 33, 6, 25, 37, 170, 10, - 30, 58, 35, 167, 168, 95, 17, 165, 180, 53, - 54, 55, 56, 52, 104, 142, 46, 58, 58, 49, - 58, 20, 55, 72, 57, 24, 167, 168, 142, 142, - 26, 58, 142, 142, 73, 180, 60, 81, 62, 83, - 142, 85, 142, 119, 88, 119, 142, 142, 142, 142, - 99, 58, 58, 64, 171, 172, 173, 174, 175, 90, - 142, 58, 142, 94, 142, 61, 95, 63, 0, 142, - 247, 248, 101, 223, 224, 225, 226, 76, 165, 142, - 179, 142, 112, 94, 142, 58, 142, 116, 160, 161, - 162, 163, 164, 165, 166, 128, 177, 108, 58, 142, - 142, 173, 174, 175, 176, 154, 139, 1, 156, 139, - 140, 151, 58, 58, 8, 114, 142, 142, 142, 13, - 14, 15, 142, 122, 18, 31, 137, 126, 22, 23, - 159, 58, 142, 162, 28, 29, 160, 142, 32, 135, - 58, 35, 36, 58, 143, 39, 142, 58, 147, 58, - 27, 58, 142, 47, 58, 58, 80, 229, 230, 176, - 58, 58, 58, 57, 165, 59, 58, 58, 58, 58, - 347, 48, 66, 67, 51, 142, 70, 142, 58, 142, - 74, 75, 58, 34, 78, 79, 58, 251, 58, 58, - 58, 58, 58, 40, 41, 42, 43, 11, 176, 176, - 26, 165, 96, 97, 98, 19, 58, 21, 176, 165, - 179, 169, 276, 285, 176, 170, 110, 178, 165, 113, - 179, 115, 176, 117, 118, 176, 176, 176, 176, 165, - 124, 45, 176, 299, 128, 129, 130, 131, 132, 133, - 165, 86, 136, 219, 138, 179, 123, 231, 125, 137, - 144, 100, 12, 130, 148, 149, 150, 134, 152, 153, - 278, 155, 156, 124, 184, 167, 385, 26, 82, 399, - 84, 165, 166, 87, 309, 89, 365, -1, 92, -1, - 127, -1, -1, -1, -1, -1, 8, -1, -1, 361, - 362, 13, 14, 15, 141, -1, 18, 111, 145, 146, - 22, 23, -1, -1, -1, -1, 28, 29, -1, -1, - 32, 383, -1, 35, 36, -1, 388, 39, 171, 172, - 173, 174, 175, -1, -1, 47, -1, 180, -1, 401, - 402, 403, 404, 405, -1, 57, -1, 59, -1, -1, - -1, 374, -1, -1, 66, 67, -1, -1, 70, -1, - -1, -1, 74, 75, -1, -1, 78, 79, -1, -1, + 42, 35, 149, 150, 4, 6, 5, 58, 52, 10, + 40, 45, 15, 28, 3, 61, 17, 63, 9, 133, + 35, 33, 59, 38, 31, 171, 168, 169, 95, 26, + 26, 30, 35, 133, 166, 181, 25, 104, 58, 26, + 52, 58, 58, 37, 143, 143, 143, 46, 143, 143, + 49, 58, 55, 143, 57, 143, 58, 72, 143, 143, + 60, 73, 62, 64, 58, 143, 143, 181, 168, 169, + 58, 27, 143, 143, 61, 119, 63, 143, 143, 40, + 41, 42, 43, 120, 99, 172, 173, 174, 175, 176, + 58, 0, 48, 94, 181, 51, 143, 143, 166, 90, + 180, 248, 249, 94, 143, 143, 95, 108, 224, 225, + 226, 227, 101, 58, 113, 143, 143, 143, 160, 161, + 162, 163, 164, 165, 166, 128, 156, 178, 117, 58, + 58, 173, 174, 175, 176, 20, 139, 138, 1, 24, + 155, 140, 141, 143, 58, 8, 143, 143, 31, 136, + 13, 14, 15, 143, 58, 18, 143, 143, 152, 22, + 23, 161, 58, 58, 58, 28, 29, 128, 124, 32, + 126, 160, 35, 36, 163, 131, 39, 58, 58, 135, + 58, 142, 58, 143, 47, 146, 147, 80, 230, 231, + 58, 76, 177, 58, 57, 166, 59, 53, 54, 55, + 56, 58, 349, 66, 67, 58, 58, 70, 58, 58, + 58, 74, 75, 143, 58, 78, 79, 143, 252, 172, + 173, 174, 175, 176, 143, 81, 58, 83, 34, 85, + 115, 58, 88, 96, 97, 98, 58, 58, 123, 58, + 58, 58, 127, 177, 278, 287, 177, 110, 166, 26, + 58, 114, 177, 116, 166, 118, 119, 180, 179, 144, + 170, 177, 125, 148, 171, 166, 129, 130, 131, 132, + 133, 134, 177, 86, 137, 177, 139, 180, 177, 177, + 177, 220, 145, 301, 166, 177, 149, 150, 151, 166, + 153, 154, 180, 156, 157, 100, 137, 232, 12, 280, + 167, 124, 26, 166, 167, 311, 185, 367, 387, 401, + -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, + -1, 363, 364, 13, 14, 15, -1, -1, 18, -1, + -1, -1, 22, 23, -1, -1, -1, -1, 28, 29, + -1, -1, 32, 385, -1, 35, 36, -1, 390, 39, + -1, -1, -1, -1, -1, -1, -1, 47, -1, -1, + -1, 403, 404, 405, 406, 407, -1, 57, -1, 59, + -1, -1, -1, 376, -1, -1, 66, 67, -1, -1, + 70, -1, -1, -1, 74, 75, -1, -1, 78, 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 96, 97, 98, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 110, -1, - -1, 113, -1, 115, -1, 117, 118, -1, -1, -1, - -1, -1, 124, -1, -1, -1, 128, 129, 130, 131, - 132, 133, -1, -1, 136, -1, 138, -1, -1, -1, - -1, -1, 144, -1, -1, -1, 148, 149, 150, -1, - 152, 153, 8, 155, 156, -1, -1, 13, 14, 15, - -1, -1, 18, 165, 166, -1, 22, 23, -1, -1, - -1, -1, 28, 29, -1, -1, 32, -1, -1, 35, - 36, -1, -1, 39, -1, -1, -1, -1, -1, -1, - -1, 47, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 57, -1, 59, -1, -1, -1, -1, -1, -1, - 66, 67, -1, -1, 70, -1, -1, -1, 74, 75, - -1, -1, 78, 79, -1, -1, -1, 7, -1, -1, - -1, -1, 12, -1, -1, -1, 16, -1, -1, -1, - 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 110, -1, -1, 113, -1, 115, - -1, 117, 118, -1, -1, -1, -1, -1, 124, -1, - 50, -1, 128, 129, 130, 131, 132, 133, -1, -1, - 136, -1, 138, -1, -1, 65, -1, -1, 144, -1, - 44, -1, 148, 149, 150, -1, 152, 153, 52, 155, - 156, -1, -1, -1, -1, -1, 86, -1, -1, -1, - 166, 91, -1, 93, 68, 69, -1, 71, -1, -1, - -1, -1, -1, 77, 104, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 96, 97, 98, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 120, 121, -1, -1, -1, -1, 100, -1, 102, 103, - -1, 105, 106, 107, -1, 109, -1, -1, -1, -1, + 110, -1, -1, -1, 114, -1, 116, -1, 118, 119, + -1, -1, -1, -1, -1, 125, -1, -1, -1, 129, + 130, 131, 132, 133, 134, -1, -1, 137, -1, 139, + -1, -1, -1, -1, -1, 145, -1, -1, -1, 149, + 150, 151, -1, 153, 154, 8, 156, 157, -1, -1, + 13, 14, 15, -1, -1, 18, 166, 167, -1, 22, + 23, -1, -1, -1, -1, 28, 29, -1, -1, 32, + -1, -1, 35, 36, -1, -1, 39, -1, -1, -1, + -1, -1, -1, -1, 47, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 57, -1, 59, -1, -1, -1, + -1, -1, -1, 66, 67, -1, -1, 70, -1, -1, + -1, 74, 75, -1, -1, 78, 79, 7, -1, -1, + -1, -1, 12, -1, -1, -1, 16, -1, -1, 11, + -1, -1, -1, 96, 97, 98, -1, 19, -1, 21, + -1, -1, -1, -1, -1, -1, -1, 110, -1, -1, + -1, 114, -1, 116, -1, 118, 119, -1, -1, -1, + 50, -1, 125, 45, -1, -1, 129, 130, 131, 132, + 133, 134, -1, -1, 137, 65, 139, -1, -1, -1, + -1, -1, 145, -1, 44, -1, 149, 150, 151, -1, + 153, 154, 52, 156, 157, -1, 86, -1, -1, -1, + 82, 91, 84, 93, 167, 87, -1, 89, 68, 69, + 92, 71, -1, -1, 104, -1, -1, 77, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 111, + 112, 121, 122, -1, -1, -1, -1, -1, -1, -1, + 100, -1, 102, 103, -1, 105, 106, 107, -1, 109, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 151, -1, 153, -1, -1, -1, 157, -1, -1, - -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 152, -1, 154, -1, -1, -1, 158, -1, + -1, -1, 162, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 157 + -1, -1, -1, -1, -1, -1, -1, -1, 158 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1384,46 +1386,46 @@ static const yytype_uint8 yystos[] = { 0, 1, 8, 13, 14, 15, 18, 22, 23, 28, 29, 32, 35, 36, 39, 47, 57, 59, 66, 67, - 70, 74, 75, 78, 79, 96, 97, 98, 110, 113, - 115, 117, 118, 124, 128, 129, 130, 131, 132, 133, - 136, 138, 144, 148, 149, 150, 152, 153, 155, 156, - 166, 182, 183, 184, 185, 186, 191, 192, 193, 194, - 198, 201, 207, 214, 217, 220, 223, 230, 231, 242, - 243, 165, 58, 31, 58, 241, 58, 58, 27, 48, - 51, 123, 125, 130, 134, 195, 196, 197, 6, 10, - 17, 64, 94, 108, 137, 218, 219, 9, 90, 94, - 210, 211, 142, 224, 218, 20, 24, 76, 114, 122, - 126, 143, 147, 203, 61, 63, 142, 187, 188, 142, - 142, 142, 142, 142, 228, 229, 142, 187, 239, 53, - 54, 55, 56, 81, 83, 85, 88, 212, 213, 239, - 142, 142, 238, 142, 142, 58, 26, 61, 63, 135, - 187, 188, 58, 142, 142, 225, 202, 203, 142, 241, - 5, 30, 46, 49, 112, 139, 140, 221, 222, 11, - 19, 21, 45, 82, 84, 87, 89, 92, 111, 199, - 200, 188, 58, 177, 235, 236, 237, 58, 234, 0, - 184, 165, 187, 187, 33, 52, 73, 233, 179, 142, - 142, 142, 142, 142, 58, 142, 197, 219, 58, 58, - 58, 211, 31, 28, 35, 38, 72, 99, 154, 204, - 205, 142, 142, 40, 41, 42, 43, 127, 141, 145, - 146, 215, 216, 184, 229, 187, 58, 58, 58, 58, - 58, 58, 58, 58, 213, 142, 208, 26, 26, 208, - 208, 80, 176, 203, 241, 241, 241, 241, 241, 241, - 241, 222, 58, 58, 37, 58, 151, 240, 58, 241, - 241, 241, 241, 58, 58, 200, 59, 119, 226, 227, - 58, 236, 58, 165, 7, 12, 16, 50, 65, 86, - 91, 93, 104, 120, 121, 151, 153, 157, 161, 189, - 190, 4, 60, 62, 142, 160, 232, 167, 168, 244, - 245, 142, 3, 25, 95, 101, 116, 159, 162, 206, - 205, 240, 240, 240, 240, 142, 58, 241, 241, 216, - 44, 52, 68, 69, 71, 77, 100, 102, 103, 105, - 106, 107, 109, 157, 209, 208, 208, 188, 142, 188, - 58, 227, 34, 241, 58, 58, 58, 58, 58, 58, - 190, 176, 176, 132, 245, 246, 247, 249, 165, 208, - 26, 58, 241, 241, 176, 165, 180, 247, 179, 178, - 187, 169, 248, 176, 170, 250, 251, 241, 176, 180, - 251, 165, 241, 179, 171, 172, 173, 174, 175, 252, - 253, 176, 176, 176, 176, 176, 180, 253, 165, 241, - 241, 241, 241, 241, 165 + 70, 74, 75, 78, 79, 96, 97, 98, 110, 114, + 116, 118, 119, 125, 129, 130, 131, 132, 133, 134, + 137, 139, 145, 149, 150, 151, 153, 154, 156, 157, + 167, 183, 184, 185, 186, 187, 192, 193, 194, 195, + 199, 202, 208, 215, 218, 221, 224, 231, 232, 243, + 244, 166, 58, 31, 58, 242, 58, 58, 27, 48, + 51, 124, 126, 131, 135, 196, 197, 198, 6, 10, + 17, 64, 94, 108, 138, 219, 220, 9, 90, 94, + 211, 212, 143, 225, 219, 20, 24, 76, 115, 123, + 127, 144, 148, 204, 61, 63, 143, 188, 189, 143, + 143, 143, 143, 143, 229, 230, 143, 188, 240, 53, + 54, 55, 56, 81, 83, 85, 88, 213, 214, 240, + 143, 143, 239, 143, 143, 58, 26, 61, 63, 136, + 188, 189, 58, 143, 143, 226, 203, 204, 143, 242, + 5, 30, 46, 49, 113, 140, 141, 222, 223, 11, + 19, 21, 45, 82, 84, 87, 89, 92, 111, 112, + 200, 201, 189, 58, 178, 236, 237, 238, 58, 235, + 0, 185, 166, 188, 188, 33, 52, 73, 234, 180, + 143, 143, 143, 143, 143, 58, 143, 198, 220, 58, + 58, 58, 212, 31, 28, 35, 38, 72, 99, 155, + 205, 206, 143, 143, 40, 41, 42, 43, 128, 142, + 146, 147, 216, 217, 185, 230, 188, 58, 58, 58, + 58, 58, 58, 58, 58, 214, 143, 209, 26, 26, + 209, 209, 80, 177, 204, 242, 242, 242, 242, 242, + 242, 242, 223, 58, 58, 37, 58, 152, 241, 58, + 242, 242, 242, 242, 58, 58, 58, 201, 59, 120, + 227, 228, 58, 237, 58, 166, 7, 12, 16, 50, + 65, 86, 91, 93, 104, 121, 122, 152, 154, 158, + 162, 190, 191, 4, 60, 62, 143, 161, 233, 168, + 169, 245, 246, 143, 3, 25, 95, 101, 117, 160, + 163, 207, 206, 241, 241, 241, 241, 143, 58, 242, + 242, 217, 44, 52, 68, 69, 71, 77, 100, 102, + 103, 105, 106, 107, 109, 158, 210, 209, 209, 189, + 143, 189, 58, 228, 34, 242, 58, 58, 58, 58, + 58, 58, 191, 177, 177, 133, 246, 247, 248, 250, + 166, 209, 26, 58, 242, 242, 177, 166, 181, 248, + 180, 179, 188, 170, 249, 177, 171, 251, 252, 242, + 177, 181, 252, 166, 242, 180, 172, 173, 174, 175, + 176, 253, 254, 177, 177, 177, 177, 177, 181, 254, + 166, 242, 242, 242, 242, 242, 166 }; #define yyerrok (yyerrstatus = 0) @@ -2237,7 +2239,7 @@ yyreduce: case 5: /* Line 1455 of yacc.c */ -#line 319 "ntp_parser.y" +#line 320 "ntp_parser.y" { /* I will need to incorporate much more fine grained * error messages. The following should suffice for @@ -2254,7 +2256,7 @@ yyreduce: case 19: /* Line 1455 of yacc.c */ -#line 353 "ntp_parser.y" +#line 354 "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) @@ -2265,7 +2267,7 @@ yyreduce: case 20: /* Line 1455 of yacc.c */ -#line 359 "ntp_parser.y" +#line 360 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL); if (my_node) @@ -2276,147 +2278,147 @@ yyreduce: case 27: /* Line 1455 of yacc.c */ -#line 376 "ntp_parser.y" +#line 377 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); } break; case 28: /* Line 1455 of yacc.c */ -#line 377 "ntp_parser.y" +#line 378 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); } break; case 29: /* Line 1455 of yacc.c */ -#line 381 "ntp_parser.y" +#line 382 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); } break; case 30: /* Line 1455 of yacc.c */ -#line 385 "ntp_parser.y" +#line 386 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 31: /* Line 1455 of yacc.c */ -#line 386 "ntp_parser.y" +#line 387 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 32: /* Line 1455 of yacc.c */ -#line 390 "ntp_parser.y" +#line 391 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 33: /* Line 1455 of yacc.c */ -#line 391 "ntp_parser.y" +#line 392 "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 392 "ntp_parser.y" +#line 393 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 35: /* Line 1455 of yacc.c */ -#line 393 "ntp_parser.y" +#line 394 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 36: /* Line 1455 of yacc.c */ -#line 394 "ntp_parser.y" +#line 395 "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 395 "ntp_parser.y" +#line 396 "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 396 "ntp_parser.y" +#line 397 "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 397 "ntp_parser.y" +#line 398 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 40: /* Line 1455 of yacc.c */ -#line 398 "ntp_parser.y" +#line 399 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 41: /* Line 1455 of yacc.c */ -#line 399 "ntp_parser.y" +#line 400 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 42: /* Line 1455 of yacc.c */ -#line 400 "ntp_parser.y" +#line 401 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 43: /* Line 1455 of yacc.c */ -#line 401 "ntp_parser.y" +#line 402 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 44: /* Line 1455 of yacc.c */ -#line 402 "ntp_parser.y" +#line 403 "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 403 "ntp_parser.y" +#line 404 "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 404 "ntp_parser.y" +#line 405 "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 414 "ntp_parser.y" +#line 415 "ntp_parser.y" { struct unpeer_node *my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); if (my_node) @@ -2427,42 +2429,42 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 433 "ntp_parser.y" +#line 434 "ntp_parser.y" { cfgt.broadcastclient = 1; } break; case 51: /* Line 1455 of yacc.c */ -#line 435 "ntp_parser.y" +#line 436 "ntp_parser.y" { append_queue(cfgt.manycastserver, (yyvsp[(2) - (2)].Queue)); } break; case 52: /* Line 1455 of yacc.c */ -#line 437 "ntp_parser.y" +#line 438 "ntp_parser.y" { append_queue(cfgt.multicastclient, (yyvsp[(2) - (2)].Queue)); } break; case 53: /* Line 1455 of yacc.c */ -#line 448 "ntp_parser.y" +#line 449 "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 450 "ntp_parser.y" +#line 451 "ntp_parser.y" { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; case 55: /* Line 1455 of yacc.c */ -#line 452 "ntp_parser.y" +#line 453 "ntp_parser.y" { cfgt.auth.cryptosw++; append_queue(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue)); @@ -2472,56 +2474,56 @@ yyreduce: case 56: /* Line 1455 of yacc.c */ -#line 457 "ntp_parser.y" +#line 458 "ntp_parser.y" { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; case 57: /* Line 1455 of yacc.c */ -#line 459 "ntp_parser.y" +#line 460 "ntp_parser.y" { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; case 58: /* Line 1455 of yacc.c */ -#line 461 "ntp_parser.y" +#line 462 "ntp_parser.y" { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; case 59: /* Line 1455 of yacc.c */ -#line 463 "ntp_parser.y" +#line 464 "ntp_parser.y" { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 60: /* Line 1455 of yacc.c */ -#line 465 "ntp_parser.y" +#line 466 "ntp_parser.y" { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } break; case 61: /* Line 1455 of yacc.c */ -#line 467 "ntp_parser.y" +#line 468 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; case 63: /* Line 1455 of yacc.c */ -#line 473 "ntp_parser.y" +#line 474 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; case 64: /* Line 1455 of yacc.c */ -#line 478 "ntp_parser.y" +#line 479 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2533,7 +2535,7 @@ yyreduce: case 65: /* Line 1455 of yacc.c */ -#line 485 "ntp_parser.y" +#line 486 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2545,49 +2547,49 @@ yyreduce: case 66: /* Line 1455 of yacc.c */ -#line 495 "ntp_parser.y" +#line 496 "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 497 "ntp_parser.y" +#line 498 "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 499 "ntp_parser.y" +#line 500 "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 501 "ntp_parser.y" +#line 502 "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 503 "ntp_parser.y" +#line 504 "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 505 "ntp_parser.y" +#line 506 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 72: /* Line 1455 of yacc.c */ -#line 507 "ntp_parser.y" +#line 508 "ntp_parser.y" { (yyval.Attr_val) = NULL; cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); @@ -2601,105 +2603,112 @@ yyreduce: case 73: /* Line 1455 of yacc.c */ -#line 524 "ntp_parser.y" +#line 525 "ntp_parser.y" { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; case 74: /* Line 1455 of yacc.c */ -#line 528 "ntp_parser.y" +#line 529 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 75: /* Line 1455 of yacc.c */ -#line 529 "ntp_parser.y" +#line 530 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 76: /* Line 1455 of yacc.c */ -#line 534 "ntp_parser.y" +#line 535 "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 536 "ntp_parser.y" +#line 537 "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 538 "ntp_parser.y" +#line 539 "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 540 "ntp_parser.y" +#line 541 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 80: /* Line 1455 of yacc.c */ -#line 542 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 543 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 81: /* Line 1455 of yacc.c */ -#line 544 "ntp_parser.y" +#line 545 "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 546 "ntp_parser.y" +#line 547 "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 548 "ntp_parser.y" +#line 549 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 84: /* Line 1455 of yacc.c */ -#line 550 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } +#line 551 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 85: /* Line 1455 of yacc.c */ -#line 552 "ntp_parser.y" +#line 553 "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 562 "ntp_parser.y" - { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } +#line 555 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 87: /* Line 1455 of yacc.c */ -#line 564 "ntp_parser.y" +#line 565 "ntp_parser.y" + { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } + break; + + case 88: + +/* Line 1455 of yacc.c */ +#line 567 "ntp_parser.y" { if (input_from_file) cfgt.stats_dir = (yyvsp[(2) - (2)].String); @@ -2710,34 +2719,34 @@ yyreduce: } break; - case 88: + case 89: /* Line 1455 of yacc.c */ -#line 573 "ntp_parser.y" +#line 576 "ntp_parser.y" { enqueue(cfgt.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Queue))); } break; - case 89: + case 90: /* Line 1455 of yacc.c */ -#line 580 "ntp_parser.y" +#line 583 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 90: + case 91: /* Line 1455 of yacc.c */ -#line 581 "ntp_parser.y" +#line 584 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 99: + case 100: /* Line 1455 of yacc.c */ -#line 597 "ntp_parser.y" +#line 600 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -2746,10 +2755,10 @@ yyreduce: } break; - case 100: + case 101: /* Line 1455 of yacc.c */ -#line 604 "ntp_parser.y" +#line 607 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -2758,10 +2767,10 @@ yyreduce: } break; - case 101: + case 102: /* Line 1455 of yacc.c */ -#line 614 "ntp_parser.y" +#line 617 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); @@ -2773,10 +2782,10 @@ yyreduce: } break; - case 102: + case 103: /* Line 1455 of yacc.c */ -#line 624 "ntp_parser.y" +#line 627 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); @@ -2787,10 +2796,10 @@ yyreduce: } break; - case 103: + case 104: /* Line 1455 of yacc.c */ -#line 633 "ntp_parser.y" +#line 636 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2801,10 +2810,10 @@ yyreduce: } break; - case 104: + case 105: /* Line 1455 of yacc.c */ -#line 642 "ntp_parser.y" +#line 645 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -2815,72 +2824,72 @@ yyreduce: } break; - case 105: + case 106: /* Line 1455 of yacc.c */ -#line 650 "ntp_parser.y" +#line 653 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 106: + case 107: /* Line 1455 of yacc.c */ -#line 651 "ntp_parser.y" +#line 654 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; - case 114: + case 115: /* Line 1455 of yacc.c */ -#line 671 "ntp_parser.y" +#line 674 "ntp_parser.y" { append_queue(cfgt.discard_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 115: + case 116: /* Line 1455 of yacc.c */ -#line 675 "ntp_parser.y" +#line 678 "ntp_parser.y" { append_queue(cfgt.mru_opts, (yyvsp[(2) - (2)].Queue)); } break; - case 116: + case 117: /* Line 1455 of yacc.c */ -#line 679 "ntp_parser.y" +#line 682 "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 117: + case 118: /* Line 1455 of yacc.c */ -#line 684 "ntp_parser.y" +#line 687 "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 118: + case 119: /* Line 1455 of yacc.c */ -#line 689 "ntp_parser.y" +#line 692 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); } break; - case 119: + case 120: /* Line 1455 of yacc.c */ -#line 694 "ntp_parser.y" +#line 697 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2895,10 +2904,10 @@ yyreduce: } break; - case 120: + case 121: /* Line 1455 of yacc.c */ -#line 707 "ntp_parser.y" +#line 710 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2913,10 +2922,10 @@ yyreduce: } break; - case 121: + case 122: /* Line 1455 of yacc.c */ -#line 720 "ntp_parser.y" +#line 723 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2926,220 +2935,220 @@ yyreduce: } break; - case 122: + case 123: /* Line 1455 of yacc.c */ -#line 731 "ntp_parser.y" +#line 734 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; - case 123: + case 124: /* Line 1455 of yacc.c */ -#line 733 "ntp_parser.y" +#line 736 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 138: - -/* Line 1455 of yacc.c */ -#line 755 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } - break; - case 139: /* Line 1455 of yacc.c */ -#line 757 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 758 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 140: /* Line 1455 of yacc.c */ -#line 761 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 760 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 141: /* Line 1455 of yacc.c */ -#line 762 "ntp_parser.y" +#line 764 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 142: /* Line 1455 of yacc.c */ -#line 763 "ntp_parser.y" +#line 765 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 143: /* Line 1455 of yacc.c */ -#line 768 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 766 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 144: /* Line 1455 of yacc.c */ -#line 770 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 771 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 145: /* Line 1455 of yacc.c */ -#line 774 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 773 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 146: /* Line 1455 of yacc.c */ -#line 775 "ntp_parser.y" +#line 777 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 147: /* Line 1455 of yacc.c */ -#line 776 "ntp_parser.y" +#line 778 "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 777 "ntp_parser.y" +#line 779 "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 778 "ntp_parser.y" +#line 780 "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 779 "ntp_parser.y" +#line 781 "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 780 "ntp_parser.y" +#line 782 "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 781 "ntp_parser.y" +#line 783 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 153: /* Line 1455 of yacc.c */ -#line 790 "ntp_parser.y" - { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } +#line 784 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 154: /* Line 1455 of yacc.c */ -#line 795 "ntp_parser.y" - { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 793 "ntp_parser.y" + { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; case 155: /* Line 1455 of yacc.c */ -#line 797 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 798 "ntp_parser.y" + { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 156: /* Line 1455 of yacc.c */ -#line 801 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 800 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 157: /* Line 1455 of yacc.c */ -#line 802 "ntp_parser.y" +#line 804 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 158: /* Line 1455 of yacc.c */ -#line 803 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 805 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 159: /* Line 1455 of yacc.c */ -#line 804 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 806 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 160: /* Line 1455 of yacc.c */ -#line 805 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 807 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 161: /* Line 1455 of yacc.c */ -#line 806 "ntp_parser.y" +#line 808 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 162: /* Line 1455 of yacc.c */ -#line 807 "ntp_parser.y" +#line 809 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 163: /* Line 1455 of yacc.c */ -#line 808 "ntp_parser.y" +#line 810 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 164: /* Line 1455 of yacc.c */ -#line 817 "ntp_parser.y" - { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } +#line 811 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 165: /* Line 1455 of yacc.c */ -#line 819 "ntp_parser.y" - { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } +#line 820 "ntp_parser.y" + { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } break; case 166: /* Line 1455 of yacc.c */ -#line 824 "ntp_parser.y" +#line 822 "ntp_parser.y" + { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } + break; + + case 167: + +/* Line 1455 of yacc.c */ +#line 827 "ntp_parser.y" { if ((yyvsp[(2) - (2)].Attr_val) != NULL) (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); @@ -3148,10 +3157,10 @@ yyreduce: } break; - case 167: + case 168: /* Line 1455 of yacc.c */ -#line 831 "ntp_parser.y" +#line 834 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Attr_val) != NULL) (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); @@ -3160,52 +3169,52 @@ yyreduce: } break; - case 168: - -/* Line 1455 of yacc.c */ -#line 840 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } - break; - case 169: /* Line 1455 of yacc.c */ -#line 841 "ntp_parser.y" +#line 843 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 170: /* Line 1455 of yacc.c */ -#line 842 "ntp_parser.y" +#line 844 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 171: /* Line 1455 of yacc.c */ -#line 843 "ntp_parser.y" +#line 845 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 172: /* Line 1455 of yacc.c */ -#line 844 "ntp_parser.y" +#line 846 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 173: /* Line 1455 of yacc.c */ -#line 845 "ntp_parser.y" +#line 847 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 174: /* Line 1455 of yacc.c */ -#line 847 "ntp_parser.y" +#line 848 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } + break; + + case 175: + +/* Line 1455 of yacc.c */ +#line 850 "ntp_parser.y" { if (input_from_file) (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); @@ -3216,80 +3225,80 @@ yyreduce: } break; - case 175: - -/* Line 1455 of yacc.c */ -#line 862 "ntp_parser.y" - { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } - break; - case 176: /* Line 1455 of yacc.c */ -#line 866 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } +#line 865 "ntp_parser.y" + { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } break; case 177: /* Line 1455 of yacc.c */ -#line 867 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } +#line 869 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 178: /* Line 1455 of yacc.c */ -#line 871 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 870 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 179: /* Line 1455 of yacc.c */ -#line 872 "ntp_parser.y" +#line 874 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 180: /* Line 1455 of yacc.c */ -#line 873 "ntp_parser.y" +#line 875 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 181: /* Line 1455 of yacc.c */ -#line 874 "ntp_parser.y" +#line 876 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 182: /* Line 1455 of yacc.c */ -#line 875 "ntp_parser.y" +#line 877 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 183: /* Line 1455 of yacc.c */ -#line 876 "ntp_parser.y" +#line 878 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 184: /* Line 1455 of yacc.c */ -#line 877 "ntp_parser.y" +#line 879 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } + break; + + case 185: + +/* Line 1455 of yacc.c */ +#line 880 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; - case 186: + case 187: /* Line 1455 of yacc.c */ -#line 888 "ntp_parser.y" +#line 891 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -3307,62 +3316,62 @@ yyreduce: } break; - case 187: + case 188: /* Line 1455 of yacc.c */ -#line 904 "ntp_parser.y" +#line 907 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); } break; - case 188: + case 189: /* Line 1455 of yacc.c */ -#line 910 "ntp_parser.y" +#line 913 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 189: + case 190: /* Line 1455 of yacc.c */ -#line 912 "ntp_parser.y" +#line 915 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; - case 190: + case 191: /* Line 1455 of yacc.c */ -#line 914 "ntp_parser.y" +#line 917 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; - case 191: + case 192: /* Line 1455 of yacc.c */ -#line 916 "ntp_parser.y" +#line 919 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; - case 192: + case 193: /* Line 1455 of yacc.c */ -#line 918 "ntp_parser.y" +#line 921 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 193: + case 194: /* Line 1455 of yacc.c */ -#line 921 "ntp_parser.y" +#line 924 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 194: + case 195: /* Line 1455 of yacc.c */ -#line 923 "ntp_parser.y" +#line 926 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3374,24 +3383,24 @@ yyreduce: } break; - case 195: + case 196: /* Line 1455 of yacc.c */ -#line 934 "ntp_parser.y" +#line 937 "ntp_parser.y" { append_queue(cfgt.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 196: + case 197: /* Line 1455 of yacc.c */ -#line 936 "ntp_parser.y" +#line 939 "ntp_parser.y" { append_queue(cfgt.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 197: + case 198: /* Line 1455 of yacc.c */ -#line 938 "ntp_parser.y" +#line 941 "ntp_parser.y" { if (input_from_file) enqueue(cfgt.vars, @@ -3403,123 +3412,123 @@ yyreduce: } break; - case 198: + case 199: /* Line 1455 of yacc.c */ -#line 948 "ntp_parser.y" +#line 951 "ntp_parser.y" { enqueue(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 199: + case 200: /* Line 1455 of yacc.c */ -#line 950 "ntp_parser.y" +#line 953 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (2)].Address_node), NULL)); } break; - case 200: + case 201: /* Line 1455 of yacc.c */ -#line 952 "ntp_parser.y" +#line 955 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 201: + case 202: /* Line 1455 of yacc.c */ -#line 954 "ntp_parser.y" +#line 957 "ntp_parser.y" { append_queue(cfgt.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 202: + case 203: /* Line 1455 of yacc.c */ -#line 956 "ntp_parser.y" +#line 959 "ntp_parser.y" { enqueue(cfgt.qos, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 203: + case 204: /* Line 1455 of yacc.c */ -#line 961 "ntp_parser.y" +#line 964 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 204: + case 205: /* Line 1455 of yacc.c */ -#line 963 "ntp_parser.y" +#line 966 "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 205: + case 206: /* Line 1455 of yacc.c */ -#line 966 "ntp_parser.y" +#line 969 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 206: + case 207: /* Line 1455 of yacc.c */ -#line 971 "ntp_parser.y" +#line 974 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } break; - case 207: + case 208: /* Line 1455 of yacc.c */ -#line 973 "ntp_parser.y" +#line 976 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 208: + case 209: /* Line 1455 of yacc.c */ -#line 978 "ntp_parser.y" +#line 981 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 209: + case 210: /* Line 1455 of yacc.c */ -#line 979 "ntp_parser.y" +#line 982 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 210: + case 211: /* Line 1455 of yacc.c */ -#line 983 "ntp_parser.y" +#line 986 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; - case 211: + case 212: /* Line 1455 of yacc.c */ -#line 984 "ntp_parser.y" +#line 987 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node)); } break; - case 212: + case 213: /* Line 1455 of yacc.c */ -#line 988 "ntp_parser.y" +#line 991 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 213: + case 214: /* Line 1455 of yacc.c */ -#line 989 "ntp_parser.y" +#line 992 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 214: + case 215: /* Line 1455 of yacc.c */ -#line 994 "ntp_parser.y" +#line 997 "ntp_parser.y" { char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = (yyvsp[(1) - (1)].String) + 1; @@ -3533,100 +3542,100 @@ yyreduce: } break; - case 215: + case 216: /* Line 1455 of yacc.c */ -#line 1009 "ntp_parser.y" +#line 1012 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer))); } break; - case 216: + case 217: /* Line 1455 of yacc.c */ -#line 1014 "ntp_parser.y" +#line 1017 "ntp_parser.y" { enqueue(cfgt.nic_rules, create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer))); } break; - case 226: + case 227: /* Line 1455 of yacc.c */ -#line 1045 "ntp_parser.y" +#line 1048 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 227: + case 228: /* Line 1455 of yacc.c */ -#line 1046 "ntp_parser.y" +#line 1049 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 228: + case 229: /* Line 1455 of yacc.c */ -#line 1051 "ntp_parser.y" +#line 1054 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 229: + case 230: /* Line 1455 of yacc.c */ -#line 1053 "ntp_parser.y" +#line 1056 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 230: + case 231: /* Line 1455 of yacc.c */ -#line 1058 "ntp_parser.y" +#line 1061 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[(1) - (1)].Integer)); } break; - case 232: + case 233: /* Line 1455 of yacc.c */ -#line 1064 "ntp_parser.y" +#line 1067 "ntp_parser.y" { (yyval.Attr_val) = create_attr_shorts('-', (yyvsp[(2) - (5)].Integer), (yyvsp[(4) - (5)].Integer)); } break; - case 233: + case 234: /* Line 1455 of yacc.c */ -#line 1068 "ntp_parser.y" +#line 1071 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 234: + case 235: /* Line 1455 of yacc.c */ -#line 1069 "ntp_parser.y" +#line 1072 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 235: + case 236: /* Line 1455 of yacc.c */ -#line 1073 "ntp_parser.y" +#line 1076 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 236: + case 237: /* Line 1455 of yacc.c */ -#line 1074 "ntp_parser.y" +#line 1077 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 237: + case 238: /* Line 1455 of yacc.c */ -#line 1079 "ntp_parser.y" +#line 1082 "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"); @@ -3637,31 +3646,31 @@ yyreduce: } break; - case 238: + case 239: /* Line 1455 of yacc.c */ -#line 1087 "ntp_parser.y" +#line 1090 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 239: + case 240: /* Line 1455 of yacc.c */ -#line 1088 "ntp_parser.y" +#line 1091 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 240: + case 241: /* Line 1455 of yacc.c */ -#line 1092 "ntp_parser.y" +#line 1095 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 242: + case 243: /* Line 1455 of yacc.c */ -#line 1103 "ntp_parser.y" +#line 1106 "ntp_parser.y" { cfgt.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3670,150 +3679,150 @@ yyreduce: } break; - case 243: - -/* Line 1455 of yacc.c */ -#line 1117 "ntp_parser.y" - { old_config_style = 0; } - break; - case 244: /* Line 1455 of yacc.c */ -#line 1121 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } +#line 1120 "ntp_parser.y" + { old_config_style = 0; } break; case 245: /* Line 1455 of yacc.c */ -#line 1122 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } +#line 1124 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; case 246: /* Line 1455 of yacc.c */ -#line 1126 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1125 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; case 247: /* Line 1455 of yacc.c */ -#line 1127 "ntp_parser.y" +#line 1129 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 248: /* Line 1455 of yacc.c */ -#line 1131 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } +#line 1130 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 249: /* Line 1455 of yacc.c */ -#line 1132 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } +#line 1134 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; case 250: /* Line 1455 of yacc.c */ -#line 1137 "ntp_parser.y" - { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } +#line 1135 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; case 251: /* Line 1455 of yacc.c */ -#line 1141 "ntp_parser.y" - { (yyval.Double) = (yyvsp[(3) - (4)].Double); } +#line 1140 "ntp_parser.y" + { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } break; case 252: /* Line 1455 of yacc.c */ -#line 1145 "ntp_parser.y" - { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } +#line 1144 "ntp_parser.y" + { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; case 253: /* Line 1455 of yacc.c */ -#line 1149 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } +#line 1148 "ntp_parser.y" + { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; case 254: /* Line 1455 of yacc.c */ -#line 1150 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } +#line 1152 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; case 255: /* Line 1455 of yacc.c */ -#line 1155 "ntp_parser.y" - { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } +#line 1153 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; case 256: /* Line 1455 of yacc.c */ -#line 1159 "ntp_parser.y" - { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } +#line 1158 "ntp_parser.y" + { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; case 257: /* Line 1455 of yacc.c */ -#line 1160 "ntp_parser.y" - { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } +#line 1162 "ntp_parser.y" + { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; case 258: /* Line 1455 of yacc.c */ -#line 1165 "ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1163 "ntp_parser.y" + { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; case 259: /* Line 1455 of yacc.c */ -#line 1167 "ntp_parser.y" +#line 1168 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 260: /* Line 1455 of yacc.c */ -#line 1169 "ntp_parser.y" +#line 1170 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 261: /* Line 1455 of yacc.c */ -#line 1171 "ntp_parser.y" +#line 1172 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 262: /* Line 1455 of yacc.c */ -#line 1173 "ntp_parser.y" +#line 1174 "ntp_parser.y" + { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } + break; + + case 263: + +/* Line 1455 of yacc.c */ +#line 1176 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; /* Line 1455 of yacc.c */ -#line 3817 "ntp_parser.c" +#line 3826 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4025,7 +4034,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1177 "ntp_parser.y" +#line 1180 "ntp_parser.y" void yyerror (char *msg) diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h index 46f0dde0a..0e8bb3598 100644 --- a/ntpd/ntp_parser.h +++ b/ntpd/ntp_parser.h @@ -148,70 +148,71 @@ T_Ntpport = 364, T_NtpSignDsocket = 365, T_Orphan = 366, - T_Panic = 367, - T_Peer = 368, - T_Peerstats = 369, - T_Phone = 370, - T_Pid = 371, - T_Pidfile = 372, - T_Pool = 373, - T_Port = 374, - T_Preempt = 375, - T_Prefer = 376, - T_Protostats = 377, - T_Pw = 378, - T_Qos = 379, - T_Randfile = 380, - T_Rawstats = 381, - T_Refid = 382, - T_Requestkey = 383, - T_Restrict = 384, - T_Revoke = 385, - T_Saveconfigdir = 386, - T_Server = 387, - T_Setvar = 388, - T_Sign = 389, - T_Source = 390, - T_Statistics = 391, - T_Stats = 392, - T_Statsdir = 393, - T_Step = 394, - T_Stepout = 395, - T_Stratum = 396, - T_String = 397, - T_Sysstats = 398, - T_Tick = 399, - T_Time1 = 400, - T_Time2 = 401, - T_Timingstats = 402, - T_Tinker = 403, - T_Tos = 404, - T_Trap = 405, - T_True = 406, - T_Trustedkey = 407, - T_Ttl = 408, - T_Type = 409, - T_Unconfig = 410, - T_Unpeer = 411, - T_Version = 412, - T_WanderThreshold = 413, - T_Week = 414, - T_Wildcard = 415, - T_Xleave = 416, - T_Year = 417, - T_Flag = 418, - T_Void = 419, - T_EOC = 420, - T_Simulate = 421, - T_Beep_Delay = 422, - T_Sim_Duration = 423, - T_Server_Offset = 424, - T_Duration = 425, - T_Freq_Offset = 426, - T_Wander = 427, - T_Jitter = 428, - T_Prop_Delay = 429, - T_Proc_Delay = 430 + T_Orphanwait = 367, + T_Panic = 368, + T_Peer = 369, + T_Peerstats = 370, + T_Phone = 371, + T_Pid = 372, + T_Pidfile = 373, + T_Pool = 374, + T_Port = 375, + T_Preempt = 376, + T_Prefer = 377, + T_Protostats = 378, + T_Pw = 379, + T_Qos = 380, + T_Randfile = 381, + T_Rawstats = 382, + T_Refid = 383, + T_Requestkey = 384, + T_Restrict = 385, + T_Revoke = 386, + T_Saveconfigdir = 387, + T_Server = 388, + T_Setvar = 389, + T_Sign = 390, + T_Source = 391, + T_Statistics = 392, + T_Stats = 393, + T_Statsdir = 394, + T_Step = 395, + T_Stepout = 396, + T_Stratum = 397, + T_String = 398, + T_Sysstats = 399, + T_Tick = 400, + T_Time1 = 401, + T_Time2 = 402, + T_Timingstats = 403, + T_Tinker = 404, + T_Tos = 405, + T_Trap = 406, + T_True = 407, + T_Trustedkey = 408, + T_Ttl = 409, + T_Type = 410, + T_Unconfig = 411, + T_Unpeer = 412, + T_Version = 413, + T_WanderThreshold = 414, + T_Week = 415, + T_Wildcard = 416, + T_Xleave = 417, + T_Year = 418, + T_Flag = 419, + T_Void = 420, + T_EOC = 421, + T_Simulate = 422, + T_Beep_Delay = 423, + T_Sim_Duration = 424, + T_Server_Offset = 425, + T_Duration = 426, + T_Freq_Offset = 427, + T_Wander = 428, + T_Jitter = 429, + T_Prop_Delay = 430, + T_Proc_Delay = 431 }; #endif /* Tokens. */ @@ -324,70 +325,71 @@ #define T_Ntpport 364 #define T_NtpSignDsocket 365 #define T_Orphan 366 -#define T_Panic 367 -#define T_Peer 368 -#define T_Peerstats 369 -#define T_Phone 370 -#define T_Pid 371 -#define T_Pidfile 372 -#define T_Pool 373 -#define T_Port 374 -#define T_Preempt 375 -#define T_Prefer 376 -#define T_Protostats 377 -#define T_Pw 378 -#define T_Qos 379 -#define T_Randfile 380 -#define T_Rawstats 381 -#define T_Refid 382 -#define T_Requestkey 383 -#define T_Restrict 384 -#define T_Revoke 385 -#define T_Saveconfigdir 386 -#define T_Server 387 -#define T_Setvar 388 -#define T_Sign 389 -#define T_Source 390 -#define T_Statistics 391 -#define T_Stats 392 -#define T_Statsdir 393 -#define T_Step 394 -#define T_Stepout 395 -#define T_Stratum 396 -#define T_String 397 -#define T_Sysstats 398 -#define T_Tick 399 -#define T_Time1 400 -#define T_Time2 401 -#define T_Timingstats 402 -#define T_Tinker 403 -#define T_Tos 404 -#define T_Trap 405 -#define T_True 406 -#define T_Trustedkey 407 -#define T_Ttl 408 -#define T_Type 409 -#define T_Unconfig 410 -#define T_Unpeer 411 -#define T_Version 412 -#define T_WanderThreshold 413 -#define T_Week 414 -#define T_Wildcard 415 -#define T_Xleave 416 -#define T_Year 417 -#define T_Flag 418 -#define T_Void 419 -#define T_EOC 420 -#define T_Simulate 421 -#define T_Beep_Delay 422 -#define T_Sim_Duration 423 -#define T_Server_Offset 424 -#define T_Duration 425 -#define T_Freq_Offset 426 -#define T_Wander 427 -#define T_Jitter 428 -#define T_Prop_Delay 429 -#define T_Proc_Delay 430 +#define T_Orphanwait 367 +#define T_Panic 368 +#define T_Peer 369 +#define T_Peerstats 370 +#define T_Phone 371 +#define T_Pid 372 +#define T_Pidfile 373 +#define T_Pool 374 +#define T_Port 375 +#define T_Preempt 376 +#define T_Prefer 377 +#define T_Protostats 378 +#define T_Pw 379 +#define T_Qos 380 +#define T_Randfile 381 +#define T_Rawstats 382 +#define T_Refid 383 +#define T_Requestkey 384 +#define T_Restrict 385 +#define T_Revoke 386 +#define T_Saveconfigdir 387 +#define T_Server 388 +#define T_Setvar 389 +#define T_Sign 390 +#define T_Source 391 +#define T_Statistics 392 +#define T_Stats 393 +#define T_Statsdir 394 +#define T_Step 395 +#define T_Stepout 396 +#define T_Stratum 397 +#define T_String 398 +#define T_Sysstats 399 +#define T_Tick 400 +#define T_Time1 401 +#define T_Time2 402 +#define T_Timingstats 403 +#define T_Tinker 404 +#define T_Tos 405 +#define T_Trap 406 +#define T_True 407 +#define T_Trustedkey 408 +#define T_Ttl 409 +#define T_Type 410 +#define T_Unconfig 411 +#define T_Unpeer 412 +#define T_Version 413 +#define T_WanderThreshold 414 +#define T_Week 415 +#define T_Wildcard 416 +#define T_Xleave 417 +#define T_Year 418 +#define T_Flag 419 +#define T_Void 420 +#define T_EOC 421 +#define T_Simulate 422 +#define T_Beep_Delay 423 +#define T_Sim_Duration 424 +#define T_Server_Offset 425 +#define T_Duration 426 +#define T_Freq_Offset 427 +#define T_Wander 428 +#define T_Jitter 429 +#define T_Prop_Delay 430 +#define T_Proc_Delay 431 @@ -415,7 +417,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 419 "ntp_parser.h" +#line 421 "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 5febaa188..b3f7ac3d3 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -172,6 +172,7 @@ %token T_Ntpport %token T_NtpSignDsocket %token T_Orphan +%token T_Orphanwait %token T_Panic %token T_Peer %token T_Peerstats @@ -538,6 +539,8 @@ tos_option { $$ = create_attr_dval($1, (double)$2); } | T_Orphan T_Integer { $$ = create_attr_dval($1, (double)$2); } + | T_Orphanwait T_Integer + { $$ = create_attr_dval($1, (double)$2); } | T_Mindist number { $$ = create_attr_dval($1, $2); } | T_Maxdist number diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c index 0d63086d9..930c24e6b 100644 --- a/ntpd/ntp_proto.c +++ b/ntpd/ntp_proto.c @@ -1678,8 +1678,6 @@ clock_update( struct peer *peer /* peer structure pointer */ ) { - struct peer *o_sys_peer; - u_char o_sys_stratum; double dtemp; l_fp now; #ifdef HAVE_LIBSCF_H @@ -1690,7 +1688,6 @@ clock_update( * Update the system state variables. We do this very carefully, * as the poll interval might need to be clamped differently. */ - o_sys_peer = sys_peer; sys_peer = peer; sys_epoch = peer->epoch; if (sys_poll < peer->minpoll) @@ -1698,7 +1695,6 @@ clock_update( if (sys_poll > peer->maxpoll) sys_poll = peer->maxpoll; poll_update(peer, sys_poll); - o_sys_stratum = sys_stratum; sys_stratum = min(peer->stratum + 1, STRATUM_UNSPEC); if (peer->stratum == STRATUM_REFCLOCK || peer->stratum == STRATUM_UNSPEC) @@ -1773,8 +1769,7 @@ clock_update( * leap bits. If crypto, the timer will goose the setup * process. */ - if (sys_leap == LEAP_NOTINSYNC || (o_sys_peer == NULL && - o_sys_stratum == (u_char)sys_orphan)) { + if (sys_leap == LEAP_NOTINSYNC) { sys_leap = LEAP_NOWARNING; #ifdef OPENSSL if (crypto_flags) diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c index f422245e8..f104583c2 100644 --- a/ntpd/ntpd.c +++ b/ntpd/ntpd.c @@ -641,16 +641,9 @@ ntpdmain( # endif # if defined(HAVE_WORKING_FORK) long wait_sync = 0; - int s; int pipe_fds[2]; int rc; int exit_code; -# ifdef F_CLOSEM - int f_closem_errno; - int first_to_close; -# else /* !F_CLOSEM follows */ - int max_fd; -# endif /* !F_CLOSEM */ # ifdef _AIX struct sigaction sa; # endif