From: Dave Hart Date: Thu, 17 Sep 2009 01:31:14 +0000 (+0000) Subject: [Bug 1303] remove top-level "autokey" directive. X-Git-Tag: NTP_4_2_5P214~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1f1ae69340ab9a6961ae64c37aed6c5986bd08;p=thirdparty%2Fntp.git [Bug 1303] remove top-level "autokey" directive. correct "checking" message for --disable-bug1243-fix. use "nic listen 192.168.0.0/16" instead of "nic listen 192.168.0.0 prefixlen 16" bk: 4ab19162PJO9UIVJLwMgutgv7rYzIg --- diff --git a/ChangeLog b/ChangeLog index e9d75707a..2e2e13c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +* [Bug 1303] remove top-level "autokey" directive. +* use "nic listen 192.168.0.0/16" instead of + "nic listen 192.168.0.0 prefixlen 16". (4.2.5p213) 2009/09/16 Released by Harlan Stenn * [Bug 1310] fix Thunderbolt mode in refclock_palisade.c (4.2.5p212) 2009/09/15 Released by Harlan Stenn diff --git a/configure.ac b/configure.ac index a1a0c94d8..1891b7806 100644 --- a/configure.ac +++ b/configure.ac @@ -4239,7 +4239,7 @@ case "$ans" in esac -AC_MSG_CHECKING([if we want old session key behavior]) +AC_MSG_CHECKING([if we want new session key behavior]) AC_ARG_ENABLE( [bug1243-fix], diff --git a/html/miscopt.html b/html/miscopt.html index ec8312e8e..83afe6c33 100644 --- a/html/miscopt.html +++ b/html/miscopt.html @@ -50,8 +50,8 @@
includefile includefile
This command allows additional configuration commands to be included from a separate file. Include files may be nested to a depth of five; upon reaching the end of any include file, command processing resumes in the previous configuration file. This option is useful for sites that run ntpd on multiple hosts, with (mostly) common options (e.g., a restriction list).
-
interface [listen | ignore | drop] [all | ipv4 | ipv6 | name | address] [[prefixlen bits]]
-
This command controls which network addresses ntpd opens, and whether input is dropped without processing. The first parameter determines the action for addresses which match the second parameter. That parameter specifies a class of addresses, or a specific interface name, or an address. In the address case, prefixlen determines how many bits must match for this rule to apply. The ignore action prevents opening matching addresses, in contrast, drop causes ntpd to open the interface and drop all received packets without examination. Multiple interface commands can be used. The last rule which matches a particular address determines the action for it. The nic command is an alias for interface.
+
interface [listen | ignore | drop] [all | ipv4 | ipv6 | name | address[/prefixlen]]
+
This command controls which network addresses ntpd opens, and whether input is dropped without processing. The first parameter determines the action for addresses which match the second parameter. That parameter specifies a class of addresses, or a specific interface name, or an address. In the address case, prefixlen determines how many bits must match for this rule to apply. The ignore action prevents opening matching addresses, in contrast, drop causes ntpd to open the interface and drop all received packets without examination. Multiple interface commands can be used. The last rule which matches a particular address determines the action for it. The nic command is an alias for interface.
leapfile leapfile
This command loads the NIST leapseconds file and initializes the leapsecond values for the next leapsecond time, expiration time and TAI offset. The file can be obtained directly from NIST national time servers using ftp as the ASCII file pub/leap-seconds.
While not strictly a security function, the Autokey protocol provides means to securely retrieve the current or updated leapsecond values from a server.
diff --git a/include/ntp_config.h b/include/ntp_config.h index 03c03d1ac..27860a781 100644 --- a/include/ntp_config.h +++ b/include/ntp_config.h @@ -95,7 +95,6 @@ struct unpeer_node { }; struct auth_node { - int autokey; int control_key; queue *crypto_cmd_list; char *keys; @@ -120,7 +119,6 @@ struct setvar_node { typedef struct nic_rule_node_tag { int match_class; char *if_name; /* interface name or numeric address */ - int prefixlen; /* -1 for not specified */ int action; } nic_rule_node; @@ -215,7 +213,7 @@ struct sim_node *create_sim_node(queue *init_opts, queue *servers); struct setvar_node *create_setvar_node(char *var, char *val, u_short def); nic_rule_node *create_nic_rule_node(int match_class, char *if_name, - int prefixlen, int action); + int action); script_info *create_sim_script_info(double duration, queue *script_queue); diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c index 32f3ceb20..653bd4b03 100644 --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c @@ -1370,9 +1370,6 @@ dump_config_tree( break; } - if (-1 != rule_node->prefixlen) - fprintf(df, " prefixlen %d", rule_node->prefixlen); - fprintf(df, "\n"); } @@ -1866,7 +1863,6 @@ nic_rule_node * create_nic_rule_node( int match_class, char *if_name, /* interface name or numeric address */ - int prefixlen, int action ) { @@ -1875,7 +1871,6 @@ create_nic_rule_node( my_node = get_node(sizeof(*my_node)); my_node->match_class = match_class; my_node->if_name = if_name; - my_node->prefixlen = prefixlen; my_node->action = action; return my_node; @@ -2214,7 +2209,6 @@ struct key_tok keyword_list[] = { { "ipv6", T_Ipv6, NO_ARG }, { "listen", T_Listen, NO_ARG }, { "drop", T_Drop, NO_ARG }, - { "prefixlen", T_Prefixlen, NO_ARG }, /* simulator commands */ { "simulate", T_Simulate, NO_ARG }, { "simulation_duration",T_Sim_Duration, NO_ARG }, @@ -2779,11 +2773,18 @@ config_nic_rules( isc_netaddr_t netaddr; nic_rule_match match_type; nic_rule_action action; + char * if_name; + char * pchSlash; + int prefixlen = -1; for (curr_node = queue_head(ptree->nic_rules); curr_node != NULL; curr_node = next_node(curr_node)) { + if_name = curr_node->if_name; + if (if_name != NULL) + if_name = estrdup(if_name); + switch (curr_node->match_class) { default: @@ -2794,10 +2795,25 @@ config_nic_rules( break; case 0: - if (is_ip_address(curr_node->if_name, &netaddr)) + pchSlash = strchr(if_name, '/'); + if (pchSlash != NULL) + *pchSlash = '\0'; + if (is_ip_address(if_name, &netaddr)) { match_type = MATCH_IFADDR; - else + if (pchSlash != NULL) { + sscanf(pchSlash + 1, "%d", + &prefixlen); + prefixlen = max(-1, prefixlen); + prefixlen = min(prefixlen, + (AF_INET6 == netaddr.family) + ? 128 + : 32); + } + } else { match_type = MATCH_IFNAME; + if (pchSlash != NULL) + *pchSlash = '/'; + } break; case T_All: @@ -2835,9 +2851,11 @@ config_nic_rules( break; } - add_nic_rule(match_type, curr_node->if_name, - curr_node->prefixlen, action); + add_nic_rule(match_type, if_name, prefixlen, + action); timer_interfacetimeout(current_time + 2); + if (if_name != NULL) + free(if_name); } } diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index aabd437d5..e7ca1da5b 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -240,58 +240,57 @@ T_Port = 364, T_Preempt = 365, T_Prefer = 366, - T_Prefixlen = 367, - T_Protostats = 368, - T_Pw = 369, - T_Qos = 370, - T_RandFile = 371, - T_Rawstats = 372, - T_Refid = 373, - T_Requestkey = 374, - T_Restrict = 375, - T_Revoke = 376, - T_Server = 377, - T_Setvar = 378, - T_Sign = 379, - T_Statistics = 380, - T_Stats = 381, - T_Statsdir = 382, - T_Step = 383, - T_Stepout = 384, - T_Stratum = 385, - T_String = 386, - T_Sysstats = 387, - T_Tick = 388, - T_Time1 = 389, - T_Time2 = 390, - T_Timingstats = 391, - T_Tinker = 392, - T_Tos = 393, - T_Trap = 394, - T_True = 395, - T_Trustedkey = 396, - T_Ttl = 397, - T_Type = 398, - T_Unconfig = 399, - T_Unpeer = 400, - T_Version = 401, - T_WanderThreshold = 402, - T_Week = 403, - T_Xleave = 404, - T_Year = 405, - T_Flag = 406, - T_Void = 407, - T_EOC = 408, - T_Simulate = 409, - T_Beep_Delay = 410, - T_Sim_Duration = 411, - T_Server_Offset = 412, - T_Duration = 413, - T_Freq_Offset = 414, - T_Wander = 415, - T_Jitter = 416, - T_Prop_Delay = 417, - T_Proc_Delay = 418 + T_Protostats = 367, + T_Pw = 368, + T_Qos = 369, + T_RandFile = 370, + T_Rawstats = 371, + T_Refid = 372, + T_Requestkey = 373, + T_Restrict = 374, + T_Revoke = 375, + T_Server = 376, + T_Setvar = 377, + T_Sign = 378, + T_Statistics = 379, + T_Stats = 380, + T_Statsdir = 381, + T_Step = 382, + T_Stepout = 383, + T_Stratum = 384, + T_String = 385, + T_Sysstats = 386, + T_Tick = 387, + T_Time1 = 388, + T_Time2 = 389, + T_Timingstats = 390, + T_Tinker = 391, + T_Tos = 392, + T_Trap = 393, + T_True = 394, + T_Trustedkey = 395, + T_Ttl = 396, + T_Type = 397, + T_Unconfig = 398, + T_Unpeer = 399, + T_Version = 400, + T_WanderThreshold = 401, + T_Week = 402, + T_Xleave = 403, + T_Year = 404, + T_Flag = 405, + T_Void = 406, + T_EOC = 407, + T_Simulate = 408, + T_Beep_Delay = 409, + T_Sim_Duration = 410, + T_Server_Offset = 411, + T_Duration = 412, + T_Freq_Offset = 413, + T_Wander = 414, + T_Jitter = 415, + T_Prop_Delay = 416, + T_Proc_Delay = 417 }; #endif /* Tokens. */ @@ -404,58 +403,57 @@ #define T_Port 364 #define T_Preempt 365 #define T_Prefer 366 -#define T_Prefixlen 367 -#define T_Protostats 368 -#define T_Pw 369 -#define T_Qos 370 -#define T_RandFile 371 -#define T_Rawstats 372 -#define T_Refid 373 -#define T_Requestkey 374 -#define T_Restrict 375 -#define T_Revoke 376 -#define T_Server 377 -#define T_Setvar 378 -#define T_Sign 379 -#define T_Statistics 380 -#define T_Stats 381 -#define T_Statsdir 382 -#define T_Step 383 -#define T_Stepout 384 -#define T_Stratum 385 -#define T_String 386 -#define T_Sysstats 387 -#define T_Tick 388 -#define T_Time1 389 -#define T_Time2 390 -#define T_Timingstats 391 -#define T_Tinker 392 -#define T_Tos 393 -#define T_Trap 394 -#define T_True 395 -#define T_Trustedkey 396 -#define T_Ttl 397 -#define T_Type 398 -#define T_Unconfig 399 -#define T_Unpeer 400 -#define T_Version 401 -#define T_WanderThreshold 402 -#define T_Week 403 -#define T_Xleave 404 -#define T_Year 405 -#define T_Flag 406 -#define T_Void 407 -#define T_EOC 408 -#define T_Simulate 409 -#define T_Beep_Delay 410 -#define T_Sim_Duration 411 -#define T_Server_Offset 412 -#define T_Duration 413 -#define T_Freq_Offset 414 -#define T_Wander 415 -#define T_Jitter 416 -#define T_Prop_Delay 417 -#define T_Proc_Delay 418 +#define T_Protostats 367 +#define T_Pw 368 +#define T_Qos 369 +#define T_RandFile 370 +#define T_Rawstats 371 +#define T_Refid 372 +#define T_Requestkey 373 +#define T_Restrict 374 +#define T_Revoke 375 +#define T_Server 376 +#define T_Setvar 377 +#define T_Sign 378 +#define T_Statistics 379 +#define T_Stats 380 +#define T_Statsdir 381 +#define T_Step 382 +#define T_Stepout 383 +#define T_Stratum 384 +#define T_String 385 +#define T_Sysstats 386 +#define T_Tick 387 +#define T_Time1 388 +#define T_Time2 389 +#define T_Timingstats 390 +#define T_Tinker 391 +#define T_Tos 392 +#define T_Trap 393 +#define T_True 394 +#define T_Trustedkey 395 +#define T_Ttl 396 +#define T_Type 397 +#define T_Unconfig 398 +#define T_Unpeer 399 +#define T_Version 400 +#define T_WanderThreshold 401 +#define T_Week 402 +#define T_Xleave 403 +#define T_Year 404 +#define T_Flag 405 +#define T_Void 406 +#define T_EOC 407 +#define T_Simulate 408 +#define T_Beep_Delay 409 +#define T_Sim_Duration 410 +#define T_Server_Offset 411 +#define T_Duration 412 +#define T_Freq_Offset 413 +#define T_Wander 414 +#define T_Jitter 415 +#define T_Prop_Delay 416 +#define T_Proc_Delay 417 @@ -483,7 +481,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 487 "ntp_parser.c" +#line 485 "ntp_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -495,7 +493,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 499 "ntp_parser.c" +#line 497 "ntp_parser.c" #ifdef short # undef short @@ -708,22 +706,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 171 +#define YYFINAL 169 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 681 +#define YYLAST 647 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 167 +#define YYNTOKENS 166 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 68 /* YYNRULES -- Number of rules. */ -#define YYNRULES 244 +#define YYNRULES 242 /* YYNRULES -- Number of states. */ -#define YYNSTATES 383 +#define YYNSTATES 379 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 418 +#define YYMAXUTOK 417 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -737,13 +735,13 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 164, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 163, 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, 165, 2, 166, 2, 2, 2, 2, + 2, 2, 2, 164, 2, 165, 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, @@ -772,7 +770,7 @@ static const yytype_uint8 yytranslate[] = 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163 + 155, 156, 157, 158, 159, 160, 161, 162 }; #if YYDEBUG @@ -798,115 +796,114 @@ static const yytype_uint16 yyprhs[] = 382, 385, 388, 391, 394, 396, 398, 400, 402, 404, 406, 408, 410, 413, 416, 418, 421, 424, 427, 430, 433, 436, 439, 441, 445, 447, 450, 453, 456, 459, - 462, 465, 468, 471, 474, 477, 480, 483, 487, 490, - 493, 495, 498, 499, 504, 508, 511, 513, 516, 519, - 522, 524, 526, 530, 534, 540, 542, 544, 546, 548, - 550, 552, 554, 556, 559, 561, 564, 566, 569, 571, - 573, 575, 577, 579, 581, 587, 589, 593, 596, 600, - 604, 607, 609, 615, 620, 624, 627, 629, 636, 640, - 643, 647, 651, 655, 659 + 462, 465, 468, 471, 474, 477, 480, 484, 487, 490, + 492, 495, 496, 501, 505, 508, 510, 513, 516, 519, + 521, 523, 527, 531, 533, 535, 537, 539, 541, 543, + 545, 547, 550, 552, 555, 557, 560, 562, 564, 566, + 568, 570, 572, 578, 580, 584, 587, 591, 595, 598, + 600, 606, 611, 615, 618, 620, 627, 631, 634, 638, + 642, 646, 650 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 168, 0, -1, 169, -1, 169, 170, 153, -1, 170, - 153, -1, 1, 153, -1, -1, 171, -1, 177, -1, - 179, -1, 180, -1, 187, -1, 193, -1, 184, -1, - 198, -1, 201, -1, 204, -1, 207, -1, 223, -1, - 172, 173, 175, -1, 172, 173, -1, 122, -1, 108, - -1, 103, -1, 13, -1, 72, -1, 174, -1, 55, - 131, -1, 57, 131, -1, 131, -1, 175, 176, -1, - 176, -1, 7, -1, 12, 222, -1, 16, -1, 48, + 167, 0, -1, 168, -1, 168, 169, 152, -1, 169, + 152, -1, 1, 152, -1, -1, 170, -1, 176, -1, + 178, -1, 179, -1, 186, -1, 192, -1, 183, -1, + 197, -1, 200, -1, 203, -1, 206, -1, 222, -1, + 171, 172, 174, -1, 171, 172, -1, 121, -1, 108, + -1, 103, -1, 13, -1, 72, -1, 173, -1, 55, + 130, -1, 57, 130, -1, 130, -1, 174, 175, -1, + 175, -1, 7, -1, 12, 221, -1, 16, -1, 48, -1, 59, 52, -1, 82, 52, -1, 78, 52, -1, - 94, -1, 110, -1, 111, -1, 140, -1, 149, -1, - 142, 52, -1, 84, 52, -1, 146, 52, -1, 178, - 173, -1, 144, -1, 145, -1, 14, -1, 73, 220, - -1, 87, 220, -1, 7, 52, -1, 22, 52, -1, - 23, 181, -1, 60, 131, -1, 61, 131, -1, 119, - 52, -1, 141, 218, -1, 100, 131, -1, 182, -1, - -1, 182, 183, -1, 183, -1, 46, 131, -1, 49, - 131, -1, 114, 131, -1, 116, 131, -1, 121, 52, - -1, 124, 131, -1, 138, 185, -1, 185, 186, -1, - 186, -1, 19, 52, -1, 43, 52, -1, 21, 221, - -1, 101, 52, -1, 80, 222, -1, 76, 222, -1, - 79, 222, -1, 75, 222, -1, 83, 52, -1, 11, - 52, -1, 77, 52, -1, 125, 188, -1, 127, 131, - -1, 37, 189, 190, -1, 188, 189, -1, 189, -1, - 20, -1, 24, -1, 70, -1, 104, -1, 117, -1, - 132, -1, 136, -1, 113, -1, 190, 191, -1, 191, - -1, 36, 131, -1, 143, 192, -1, 66, -1, 89, + 94, -1, 110, -1, 111, -1, 139, -1, 148, -1, + 141, 52, -1, 84, 52, -1, 145, 52, -1, 177, + 172, -1, 143, -1, 144, -1, 14, -1, 73, 219, + -1, 87, 219, -1, 8, 52, -1, 22, 52, -1, + 23, 180, -1, 60, 130, -1, 61, 130, -1, 118, + 52, -1, 140, 217, -1, 100, 130, -1, 181, -1, + -1, 181, 182, -1, 182, -1, 46, 130, -1, 49, + 130, -1, 113, 130, -1, 115, 130, -1, 120, 52, + -1, 123, 130, -1, 137, 184, -1, 184, 185, -1, + 185, -1, 19, 52, -1, 43, 52, -1, 21, 220, + -1, 101, 52, -1, 80, 221, -1, 76, 221, -1, + 79, 221, -1, 75, 221, -1, 83, 52, -1, 11, + 52, -1, 77, 52, -1, 124, 187, -1, 126, 130, + -1, 37, 188, 189, -1, 187, 188, -1, 188, -1, + 20, -1, 24, -1, 70, -1, 104, -1, 116, -1, + 131, -1, 135, -1, 112, -1, 189, 190, -1, 190, + -1, 36, 130, -1, 142, 191, -1, 66, -1, 89, -1, 33, -1, 27, -1, 91, -1, 106, -1, 25, - -1, 148, -1, 86, -1, 150, -1, 3, -1, 28, - 196, -1, 120, 173, 194, -1, 120, 26, 194, -1, - 120, 55, 26, 194, -1, 120, 57, 26, 194, -1, - 120, 174, 74, 174, 194, -1, -1, 194, 195, -1, + -1, 147, -1, 86, -1, 149, -1, 3, -1, 28, + 195, -1, 119, 172, 193, -1, 119, 26, 193, -1, + 119, 55, 26, 193, -1, 119, 57, 26, 193, -1, + 119, 173, 74, 173, 193, -1, -1, 193, 194, -1, 42, -1, 50, -1, 62, -1, 63, -1, 65, -1, 71, -1, 90, -1, 92, -1, 93, -1, 95, -1, - 96, -1, 97, -1, 99, -1, 146, -1, 196, 197, - -1, 197, -1, 9, 52, -1, 81, 52, -1, 85, - 52, -1, 45, 173, 199, -1, 199, 200, -1, 200, - -1, 134, 222, -1, 135, 222, -1, 130, 52, -1, - 118, 131, -1, 38, 221, -1, 39, 221, -1, 40, - 221, -1, 41, 221, -1, 33, 202, -1, 27, 202, - -1, 202, 203, -1, 203, -1, 6, -1, 10, -1, - 17, -1, 58, -1, 85, -1, 98, -1, 126, -1, - 137, 205, -1, 205, 206, -1, 206, -1, 5, 222, - -1, 29, 222, -1, 44, 222, -1, 47, 222, -1, - 102, 222, -1, 128, 222, -1, 129, 222, -1, 214, - -1, 51, 131, 170, -1, 34, -1, 15, 222, -1, - 18, 52, -1, 133, 222, -1, 31, 208, -1, 64, - 131, -1, 107, 131, -1, 69, 131, -1, 8, 52, - -1, 68, 212, -1, 105, 219, -1, 123, 209, -1, - 139, 174, -1, 139, 174, 210, -1, 142, 218, -1, - 115, 131, -1, 131, -1, 131, 30, -1, -1, 131, - 164, 131, 26, -1, 131, 164, 131, -1, 210, 211, - -1, 211, -1, 109, 52, -1, 53, 174, -1, 212, - 213, -1, 213, -1, 131, -1, 215, 217, 216, -1, - 215, 217, 131, -1, 215, 217, 131, 112, 52, -1, - 53, -1, 88, -1, 4, -1, 54, -1, 56, -1, - 67, -1, 50, -1, 32, -1, 218, 52, -1, 52, - -1, 219, 131, -1, 131, -1, 220, 173, -1, 173, - -1, 52, -1, 140, -1, 35, -1, 52, -1, 30, - -1, 224, 165, 225, 227, 166, -1, 154, -1, 225, - 226, 153, -1, 226, 153, -1, 155, 164, 222, -1, - 156, 164, 222, -1, 227, 228, -1, 228, -1, 230, - 165, 229, 231, 166, -1, 157, 164, 222, 153, -1, - 122, 164, 173, -1, 231, 232, -1, 232, -1, 158, - 164, 222, 165, 233, 166, -1, 233, 234, 153, -1, - 234, 153, -1, 159, 164, 222, -1, 160, 164, 222, - -1, 161, 164, 222, -1, 162, 164, 222, -1, 163, - 164, 222, -1 + 96, -1, 97, -1, 99, -1, 145, -1, 195, 196, + -1, 196, -1, 9, 52, -1, 81, 52, -1, 85, + 52, -1, 45, 172, 198, -1, 198, 199, -1, 199, + -1, 133, 221, -1, 134, 221, -1, 129, 52, -1, + 117, 130, -1, 38, 220, -1, 39, 220, -1, 40, + 220, -1, 41, 220, -1, 33, 201, -1, 27, 201, + -1, 201, 202, -1, 202, -1, 6, -1, 10, -1, + 17, -1, 58, -1, 85, -1, 98, -1, 125, -1, + 136, 204, -1, 204, 205, -1, 205, -1, 5, 221, + -1, 29, 221, -1, 44, 221, -1, 47, 221, -1, + 102, 221, -1, 127, 221, -1, 128, 221, -1, 213, + -1, 51, 130, 169, -1, 34, -1, 15, 221, -1, + 18, 52, -1, 132, 221, -1, 31, 207, -1, 64, + 130, -1, 107, 130, -1, 69, 130, -1, 68, 211, + -1, 105, 218, -1, 122, 208, -1, 138, 173, -1, + 138, 173, 209, -1, 141, 217, -1, 114, 130, -1, + 130, -1, 130, 30, -1, -1, 130, 163, 130, 26, + -1, 130, 163, 130, -1, 209, 210, -1, 210, -1, + 109, 52, -1, 53, 173, -1, 211, 212, -1, 212, + -1, 130, -1, 214, 216, 215, -1, 214, 216, 130, + -1, 53, -1, 88, -1, 4, -1, 54, -1, 56, + -1, 67, -1, 50, -1, 32, -1, 217, 52, -1, + 52, -1, 218, 130, -1, 130, -1, 219, 172, -1, + 172, -1, 52, -1, 139, -1, 35, -1, 52, -1, + 30, -1, 223, 164, 224, 226, 165, -1, 153, -1, + 224, 225, 152, -1, 225, 152, -1, 154, 163, 221, + -1, 155, 163, 221, -1, 226, 227, -1, 227, -1, + 229, 164, 228, 230, 165, -1, 156, 163, 221, 152, + -1, 121, 163, 172, -1, 230, 231, -1, 231, -1, + 157, 163, 221, 164, 232, 165, -1, 232, 233, 152, + -1, 233, 152, -1, 158, 163, 221, -1, 159, 163, + 221, -1, 160, 163, 221, -1, 161, 163, 221, -1, + 162, 163, 221, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 296, 296, 300, 301, 302, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 336, - 342, 351, 352, 353, 354, 355, 359, 360, 361, 365, - 369, 370, 374, 375, 376, 377, 378, 379, 380, 381, - 382, 383, 384, 385, 386, 387, 388, 397, 405, 406, - 416, 418, 420, 431, 433, 435, 440, 442, 444, 446, - 448, 453, 455, 459, 460, 464, 466, 468, 470, 472, - 474, 484, 489, 490, 494, 496, 498, 500, 502, 504, - 506, 508, 510, 512, 514, 524, 526, 528, 536, 537, - 541, 543, 545, 547, 549, 551, 553, 555, 560, 561, - 565, 567, 569, 570, 571, 572, 576, 577, 578, 579, - 580, 581, 582, 591, 595, 600, 605, 618, 631, 639, - 640, 644, 645, 646, 647, 648, 649, 650, 651, 652, - 653, 654, 655, 656, 657, 661, 662, 666, 667, 668, - 676, 681, 682, 686, 688, 690, 692, 694, 696, 698, - 700, 709, 711, 716, 717, 721, 722, 723, 724, 725, - 726, 727, 735, 739, 740, 744, 745, 746, 747, 748, - 749, 750, 759, 760, 776, 782, 784, 786, 788, 790, - 793, 795, 797, 800, 802, 804, 806, 808, 810, 812, - 817, 819, 823, 827, 829, 834, 836, 840, 841, 845, - 846, 850, 865, 870, 875, 883, 884, 888, 889, 890, - 894, 895, 896, 906, 907, 911, 912, 916, 917, 921, - 930, 931, 935, 936, 945, 960, 964, 965, 969, 970, - 974, 975, 979, 984, 988, 992, 993, 997, 1002, 1003, - 1007, 1009, 1011, 1013, 1015 + 0, 295, 295, 299, 300, 301, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 335, + 341, 350, 351, 352, 353, 354, 358, 359, 360, 364, + 368, 369, 373, 374, 375, 376, 377, 378, 379, 380, + 381, 382, 383, 384, 385, 386, 387, 396, 404, 405, + 415, 417, 419, 430, 432, 434, 439, 441, 443, 445, + 447, 452, 454, 458, 459, 463, 465, 467, 469, 471, + 473, 483, 488, 489, 493, 495, 497, 499, 501, 503, + 505, 507, 509, 511, 513, 523, 525, 527, 535, 536, + 540, 542, 544, 546, 548, 550, 552, 554, 559, 560, + 564, 566, 568, 569, 570, 571, 575, 576, 577, 578, + 579, 580, 581, 590, 594, 599, 604, 617, 630, 638, + 639, 643, 644, 645, 646, 647, 648, 649, 650, 651, + 652, 653, 654, 655, 656, 660, 661, 665, 666, 667, + 675, 680, 681, 685, 687, 689, 691, 693, 695, 697, + 699, 708, 710, 715, 716, 720, 721, 722, 723, 724, + 725, 726, 734, 738, 739, 743, 744, 745, 746, 747, + 748, 749, 758, 759, 775, 781, 783, 785, 787, 789, + 792, 794, 797, 799, 801, 803, 805, 807, 809, 814, + 816, 820, 824, 826, 831, 833, 837, 838, 842, 843, + 847, 862, 867, 875, 876, 880, 881, 882, 886, 887, + 888, 898, 899, 903, 904, 908, 909, 913, 922, 923, + 927, 928, 937, 952, 956, 957, 961, 962, 966, 967, + 971, 976, 980, 984, 985, 989, 994, 995, 999, 1001, + 1003, 1005, 1007 }; #endif @@ -935,10 +932,10 @@ static const char *const yytname[] = "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_Prefixlen", - "T_Protostats", "T_Pw", "T_Qos", "T_RandFile", "T_Rawstats", "T_Refid", - "T_Requestkey", "T_Restrict", "T_Revoke", "T_Server", "T_Setvar", - "T_Sign", "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", "T_Stepout", + "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_Server", "T_Setvar", "T_Sign", + "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timingstats", "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", "T_Type", "T_Unconfig", "T_Unpeer", "T_Version", @@ -989,38 +986,38 @@ static const yytype_uint16 yytoknum[] = 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 61, 123, 125 + 415, 416, 417, 61, 123, 125 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 167, 168, 169, 169, 169, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, 170, 171, - 171, 172, 172, 172, 172, 172, 173, 173, 173, 174, - 175, 175, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 177, 178, 178, - 179, 179, 179, 180, 180, 180, 180, 180, 180, 180, - 180, 181, 181, 182, 182, 183, 183, 183, 183, 183, - 183, 184, 185, 185, 186, 186, 186, 186, 186, 186, - 186, 186, 186, 186, 186, 187, 187, 187, 188, 188, - 189, 189, 189, 189, 189, 189, 189, 189, 190, 190, - 191, 191, 191, 191, 191, 191, 192, 192, 192, 192, - 192, 192, 192, 193, 193, 193, 193, 193, 193, 194, - 194, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 196, 196, 197, 197, 197, - 198, 199, 199, 200, 200, 200, 200, 200, 200, 200, - 200, 201, 201, 202, 202, 203, 203, 203, 203, 203, - 203, 203, 204, 205, 205, 206, 206, 206, 206, 206, - 206, 206, 207, 207, 207, 207, 207, 207, 207, 207, - 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 208, 208, 208, 209, 209, 210, 210, 211, 211, 212, - 212, 213, 214, 214, 214, 215, 215, 216, 216, 216, - 217, 217, 217, 218, 218, 219, 219, 220, 220, 221, - 221, 221, 222, 222, 223, 224, 225, 225, 226, 226, - 227, 227, 228, 229, 230, 231, 231, 232, 233, 233, - 234, 234, 234, 234, 234 + 0, 166, 167, 168, 168, 168, 169, 169, 169, 169, + 169, 169, 169, 169, 169, 169, 169, 169, 169, 170, + 170, 171, 171, 171, 171, 171, 172, 172, 172, 173, + 174, 174, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 176, 177, 177, + 178, 178, 178, 179, 179, 179, 179, 179, 179, 179, + 179, 180, 180, 181, 181, 182, 182, 182, 182, 182, + 182, 183, 184, 184, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 186, 186, 186, 187, 187, + 188, 188, 188, 188, 188, 188, 188, 188, 189, 189, + 190, 190, 190, 190, 190, 190, 191, 191, 191, 191, + 191, 191, 191, 192, 192, 192, 192, 192, 192, 193, + 193, 194, 194, 194, 194, 194, 194, 194, 194, 194, + 194, 194, 194, 194, 194, 195, 195, 196, 196, 196, + 197, 198, 198, 199, 199, 199, 199, 199, 199, 199, + 199, 200, 200, 201, 201, 202, 202, 202, 202, 202, + 202, 202, 203, 204, 204, 205, 205, 205, 205, 205, + 205, 205, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 207, + 207, 207, 208, 208, 209, 209, 210, 210, 211, 211, + 212, 213, 213, 214, 214, 215, 215, 215, 216, 216, + 216, 217, 217, 218, 218, 219, 219, 220, 220, 220, + 221, 221, 222, 223, 224, 224, 225, 225, 226, 226, + 227, 228, 229, 230, 230, 231, 232, 232, 233, 233, + 233, 233, 233 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1044,13 +1041,13 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, - 1, 2, 0, 4, 3, 2, 1, 2, 2, 2, - 1, 1, 3, 3, 5, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 1, 2, 1, 2, 1, 1, - 1, 1, 1, 1, 5, 1, 3, 2, 3, 3, - 2, 1, 5, 4, 3, 2, 1, 6, 3, 2, - 3, 3, 3, 3, 3 + 2, 2, 2, 2, 2, 2, 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, 2, 1, 2, 1, 2, 1, 1, 1, 1, + 1, 1, 5, 1, 3, 2, 3, 3, 2, 1, + 5, 4, 3, 2, 1, 6, 3, 2, 3, 3, + 3, 3, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1058,115 +1055,113 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 0, 24, 50, 0, 0, 0, 62, - 0, 0, 192, 0, 174, 0, 0, 0, 205, 0, - 0, 0, 0, 0, 25, 0, 0, 206, 0, 23, - 0, 0, 22, 0, 0, 0, 21, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 48, 49, 225, 0, - 2, 0, 7, 0, 8, 0, 9, 10, 13, 11, - 12, 14, 15, 16, 17, 172, 0, 18, 0, 5, - 53, 182, 223, 222, 175, 176, 54, 0, 0, 0, - 0, 0, 0, 55, 61, 64, 155, 156, 157, 158, - 159, 160, 161, 152, 154, 0, 0, 0, 113, 136, - 190, 178, 151, 90, 91, 92, 93, 97, 94, 95, - 96, 0, 0, 0, 29, 0, 26, 6, 56, 57, - 179, 201, 183, 200, 181, 218, 51, 52, 60, 216, - 184, 180, 189, 58, 119, 0, 0, 119, 26, 0, - 185, 85, 89, 86, 177, 0, 0, 0, 0, 0, - 0, 0, 162, 164, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 71, 73, 186, 214, 59, - 188, 1, 0, 4, 20, 47, 212, 211, 210, 0, - 0, 65, 66, 67, 68, 69, 70, 63, 153, 137, - 138, 139, 135, 191, 105, 104, 0, 102, 103, 0, - 87, 99, 27, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 140, 142, 173, 199, 217, 215, 115, 119, - 119, 114, 0, 0, 88, 165, 166, 167, 168, 169, - 170, 171, 163, 83, 74, 221, 219, 220, 76, 75, - 81, 79, 84, 80, 78, 82, 77, 72, 0, 0, - 187, 196, 213, 3, 32, 0, 34, 35, 0, 0, - 0, 0, 39, 40, 41, 42, 0, 0, 43, 19, - 31, 207, 208, 209, 203, 202, 0, 0, 0, 0, - 100, 112, 108, 110, 106, 107, 109, 111, 101, 98, - 147, 148, 149, 150, 146, 145, 143, 144, 141, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 120, 116, 117, 119, 194, 198, 197, - 195, 33, 36, 38, 37, 45, 44, 46, 30, 0, - 0, 0, 0, 0, 0, 231, 0, 227, 118, 193, - 204, 228, 229, 0, 226, 224, 230, 0, 234, 0, - 0, 0, 0, 0, 236, 0, 0, 232, 235, 233, + 0, 0, 0, 24, 50, 0, 0, 0, 62, 0, + 0, 191, 0, 174, 0, 0, 0, 203, 0, 0, + 0, 0, 0, 25, 0, 0, 204, 0, 23, 0, + 0, 22, 0, 0, 0, 21, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 48, 49, 223, 0, 2, + 0, 7, 0, 8, 0, 9, 10, 13, 11, 12, + 14, 15, 16, 17, 172, 0, 18, 0, 5, 53, + 221, 220, 175, 176, 54, 0, 0, 0, 0, 0, + 0, 55, 61, 64, 155, 156, 157, 158, 159, 160, + 161, 152, 154, 0, 0, 0, 113, 136, 189, 178, + 151, 90, 91, 92, 93, 97, 94, 95, 96, 0, + 0, 0, 29, 0, 26, 6, 56, 57, 179, 200, + 182, 199, 181, 216, 51, 52, 60, 214, 183, 180, + 188, 58, 119, 0, 0, 119, 26, 0, 184, 85, + 89, 86, 177, 0, 0, 0, 0, 0, 0, 0, + 162, 164, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 71, 73, 185, 212, 59, 187, 1, + 0, 4, 20, 47, 210, 209, 208, 0, 0, 65, + 66, 67, 68, 69, 70, 63, 153, 137, 138, 139, + 135, 190, 105, 104, 0, 102, 103, 0, 87, 99, + 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, + 140, 142, 173, 198, 215, 213, 115, 119, 119, 114, + 0, 0, 88, 165, 166, 167, 168, 169, 170, 171, + 163, 83, 74, 219, 217, 218, 76, 75, 81, 79, + 84, 80, 78, 82, 77, 72, 0, 0, 186, 195, + 211, 3, 32, 0, 34, 35, 0, 0, 0, 0, + 39, 40, 41, 42, 0, 0, 43, 19, 31, 205, + 206, 207, 202, 201, 0, 0, 0, 0, 100, 112, + 108, 110, 106, 107, 109, 111, 101, 98, 147, 148, + 149, 150, 146, 145, 143, 144, 141, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 120, 116, 117, 119, 193, 197, 196, 194, 33, + 36, 38, 37, 45, 44, 46, 30, 0, 0, 0, + 0, 0, 229, 0, 225, 118, 192, 226, 227, 0, + 224, 222, 228, 0, 232, 0, 0, 0, 0, 0, + 234, 0, 0, 230, 233, 231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 237, 0, 239, 240, 241, 242, - 243, 244, 238 + 235, 0, 237, 238, 239, 240, 241, 242, 236 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 49, 50, 51, 52, 53, 125, 116, 269, 270, - 54, 55, 56, 57, 83, 84, 85, 58, 165, 166, - 59, 141, 111, 200, 201, 288, 60, 218, 313, 98, - 99, 61, 212, 213, 62, 93, 94, 63, 152, 153, - 64, 101, 140, 250, 251, 122, 123, 65, 66, 275, - 179, 169, 130, 126, 238, 74, 67, 68, 278, 279, - 334, 335, 350, 336, 353, 354, 367, 368 + -1, 48, 49, 50, 51, 52, 123, 114, 267, 268, + 53, 54, 55, 56, 81, 82, 83, 57, 163, 164, + 58, 139, 109, 198, 199, 286, 59, 216, 311, 96, + 97, 60, 210, 211, 61, 91, 92, 62, 150, 151, + 63, 99, 138, 248, 249, 120, 121, 64, 65, 273, + 177, 167, 128, 124, 236, 72, 66, 67, 276, 277, + 331, 332, 346, 333, 349, 350, 363, 364 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -136 +#define YYPACT_NINF -134 static const yytype_int16 yypact[] = { - 129, -119, -17, -11, -136, -136, -9, -5, -1, 24, - 6, 9, -85, 6, -136, 109, -35, -82, -136, -78, - -76, -74, -71, -68, -136, -35, -35, -136, -66, -136, - -63, -62, -136, -60, 22, -18, -136, -51, 109, -48, - -9, -2, 580, -44, 34, 34, -136, -136, -136, 88, - 290, -61, -136, -35, -136, -35, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -6, -136, -72, -136, - -136, -136, -136, -136, -136, -136, -136, -42, -36, -33, - -32, 49, 3, -136, 24, -136, -136, -136, -136, -136, - -136, -136, -136, 6, -136, 51, 62, 73, 9, -136, - 98, -136, 6, -136, -136, -136, -136, -136, -136, -136, - -136, -8, 8, 10, -136, 145, -136, 432, -136, -136, - -136, -136, -71, -136, -136, -136, -35, -35, -136, -136, - 15, -136, -136, -136, -136, -16, -15, -136, 75, -14, - -136, 109, -136, -136, -136, -9, -9, -9, -9, -9, - -9, -9, -2, -136, 101, 102, -28, 103, -9, -9, - 106, -9, -9, 112, 113, 580, -136, -47, -136, 115, - 115, -136, 16, -136, 501, -136, -136, -136, -136, 0, - -125, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, 37, -136, -136, 11, - -8, -136, -136, -136, -28, -28, -28, -28, 41, 121, - -9, -9, 145, -136, -136, -136, -136, -136, 525, -136, - -136, 525, -44, 56, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -44, 139, - -47, -136, -136, -136, -136, -9, -136, -136, 140, 142, - 143, 144, -136, -136, -136, -136, 147, 148, -136, 501, - -136, -136, -136, -136, 96, -136, 45, 46, -89, 58, - -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, 525, 525, -136, 186, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -136, 166, - -9, -9, 55, 67, -107, -136, 59, -136, 525, -136, - -136, -136, -136, -35, -136, -136, -136, 64, -136, 61, - 65, -9, 63, -118, -136, 77, -9, -136, -136, -136, - 66, 44, 69, 71, 74, 76, 78, -84, 86, -9, - -9, -9, -9, -9, -136, 90, -136, -136, -136, -136, - -136, -136, -136 + 129, -110, -30, -134, -134, 7, -7, 2, -43, 4, + 6, -81, 4, -134, 24, -37, -79, -134, -72, -69, + -67, -65, -64, -134, -37, -37, -134, -59, -134, -57, + -56, -134, -54, 17, -19, -134, -52, 24, -49, 7, + -1, 291, -48, 31, 31, -134, -134, -134, 86, 272, + -60, -134, -37, -134, -37, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -3, -134, -76, -134, -134, + -134, -134, -134, -134, -134, -35, -17, -6, -5, 81, + 8, -134, -43, -134, -134, -134, -134, -134, -134, -134, + -134, 4, -134, 87, 89, 93, 6, -134, 116, -134, + 4, -134, -134, -134, -134, -134, -134, -134, -134, -10, + 18, 19, -134, 145, -134, 413, -134, -134, -134, -134, + -65, -134, -134, -134, -37, -37, -134, -134, 20, -134, + -134, -134, -134, -15, -14, -134, 79, -9, -134, 24, + -134, -134, -134, 7, 7, 7, 7, 7, 7, 7, + -1, -134, 106, 109, -27, 112, 7, 7, 113, 7, + 7, 115, 119, 291, -134, -34, -134, 120, 120, -134, + 21, -134, 464, -134, -134, -134, -134, 1, -114, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, 38, -134, -134, 28, -10, -134, + -134, -134, -27, -27, -27, -27, 46, 126, 7, 7, + 145, -134, -134, -134, -134, -134, 502, -134, -134, 502, + -48, 49, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -48, 136, -34, -134, + -134, -134, -134, 7, -134, -134, 139, 140, 142, 143, + -134, -134, -134, -134, 144, 147, -134, 464, -134, -134, + -134, -134, -134, -134, 37, 47, -87, 56, -134, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, 502, 502, -134, 183, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -134, 7, 7, 48, + 60, -105, -134, 51, -134, 502, -134, -134, -134, -37, + -134, -134, -134, 66, -134, 61, 68, 7, 63, -130, + -134, 71, 7, -134, -134, -134, 64, 45, 67, 70, + 72, 75, 76, -62, 88, 7, 7, 7, 7, 7, + -134, 90, -134, -134, -134, -134, -134, -134, -134 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -136, -136, -136, -45, -136, -136, -3, -34, -136, -41, - -136, -136, -136, -136, -136, -136, 162, -136, -136, 82, - -136, -136, -21, -136, 50, -136, -136, -135, -136, -136, - 155, -136, -136, 43, -136, 244, -64, -136, -136, 107, - -136, -136, -136, -136, 14, -136, 136, -136, -136, -136, - -136, 215, -136, 235, -29, -40, -136, -136, -136, -13, - -136, -65, -136, -136, -136, -81, -136, -91 + -134, -134, -134, -25, -134, -134, -2, -33, -134, -40, + -134, -134, -134, -134, -134, -134, 149, -134, -134, 78, + -134, -134, -4, -134, 54, -134, -134, -133, -134, -134, + 148, -134, -134, 35, -134, 234, -61, -134, -134, 99, + -134, -134, -134, -134, 9, -134, 134, -134, -134, -134, + -134, 212, -134, 233, 16, -39, -134, -134, -134, -16, + -134, -68, -134, -134, -134, -90, -134, -99 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1176,193 +1171,184 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 144, 138, 221, 145, 271, 172, 248, 235, 134, 167, - 219, 220, 86, 115, 281, 332, 87, 142, 95, 194, - 112, 72, 113, 88, 236, 195, 176, 146, 196, 188, - 276, 277, 137, 332, 69, 70, 282, 135, 188, 136, - 352, 71, 147, 73, 177, 148, 100, 75, 357, 117, - 174, 76, 175, 118, 272, 119, 273, 120, 197, 345, - 121, 178, 249, 124, 89, 128, 276, 277, 129, 131, - 77, 132, 214, 78, 133, 362, 363, 364, 365, 366, - 139, 198, 374, 143, 314, 315, 168, 114, 171, 181, - 96, 90, 173, 180, 97, 182, 114, 283, 183, 184, - 149, 185, 284, 189, 91, 225, 226, 227, 228, 229, - 230, 231, 237, 114, 190, 202, 203, 285, 240, 241, - 224, 243, 244, 216, 216, 191, 150, 151, 193, 103, - 1, 274, 92, 104, 186, 199, 2, 3, 79, 202, - 80, 203, 4, 5, 6, 81, 217, 7, 82, 222, - 223, 8, 9, 233, 234, 239, 10, 11, 242, 286, - 12, 287, 13, 14, 245, 246, 15, 252, 280, 253, - 296, 297, 294, 295, 16, 290, 291, 292, 293, 105, - 17, 338, 18, 204, 205, 206, 207, 317, 316, 19, - 20, 319, 322, 21, 323, 324, 325, 22, 23, 326, - 327, 24, 25, 362, 363, 364, 365, 366, 329, 330, - 331, 337, 339, 106, 318, 321, 26, 27, 340, 343, - 344, 349, 107, 352, 347, 351, 108, 356, 328, 28, - 359, 361, 29, 369, 30, 370, 31, 32, 371, 376, - 372, 109, 373, 382, 33, 110, 187, 247, 34, 35, - 289, 36, 37, 192, 38, 298, 39, 102, 215, 232, - 170, 127, 40, 208, 320, 333, 41, 42, 43, 346, - 44, 45, 358, 46, 47, 209, 375, 0, 0, 210, - 211, 0, -6, 48, 0, 0, 0, 0, 0, 0, - 341, 342, 0, 0, 0, 0, 0, 2, 3, 0, - 0, 0, 0, 4, 5, 6, 0, 0, 7, 0, - 0, 355, 8, 9, 0, 0, 360, 10, 11, 0, - 0, 12, 0, 13, 14, 0, 0, 15, 0, 377, - 378, 379, 380, 381, 0, 16, 0, 0, 0, 0, - 348, 17, 0, 18, 0, 0, 0, 0, 0, 0, - 19, 20, 0, 0, 21, 0, 0, 0, 22, 23, - 0, 0, 24, 25, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 26, 27, 0, + 142, 136, 219, 75, 143, 269, 76, 132, 233, 165, + 84, 217, 218, 113, 85, 93, 329, 192, 110, 246, + 111, 86, 69, 193, 170, 234, 194, 348, 144, 174, + 186, 279, 135, 140, 329, 353, 133, 70, 134, 186, + 274, 275, 68, 145, 101, 73, 146, 175, 102, 98, + 172, 115, 173, 280, 74, 270, 195, 271, 116, 71, + 341, 117, 87, 118, 176, 119, 122, 274, 275, 131, + 77, 126, 78, 127, 129, 247, 130, 79, 137, 196, + 80, 141, 112, 166, 312, 313, 169, 94, 178, 88, + 212, 95, 171, 112, 103, 179, 358, 359, 360, 361, + 362, 147, 89, 370, 223, 224, 225, 226, 227, 228, + 229, 112, 235, 180, 281, 200, 201, 238, 239, 282, + 241, 242, 214, 214, 181, 182, 148, 149, 104, 90, + 1, 272, 197, 183, 283, 222, 105, 2, 184, 187, + 106, 188, 3, 4, 5, 189, 191, 6, 200, 201, + 215, 7, 8, 220, 221, 107, 9, 10, 231, 108, + 11, 232, 12, 13, 237, 240, 14, 243, 278, 294, + 295, 244, 250, 251, 15, 284, 292, 285, 293, 315, + 16, 335, 17, 202, 203, 204, 205, 314, 317, 18, + 19, 320, 321, 20, 322, 323, 324, 21, 22, 325, + 327, 23, 24, 358, 359, 360, 361, 362, 334, 336, + 328, 339, 340, 316, 319, 343, 25, 26, 288, 289, + 290, 291, 345, 355, 347, 348, 352, 326, 357, 27, + 365, 185, 28, 366, 29, 367, 30, 31, 368, 369, + 372, 245, 378, 32, 190, 296, 100, 33, 34, 230, + 35, 36, 287, 37, 213, 38, 168, 318, 125, 354, + 330, 39, 206, 342, 371, 40, 41, 42, 0, 43, + 44, 0, 45, 46, 207, 0, 0, 0, 208, 209, + 2, -6, 47, 0, 0, 3, 4, 5, 337, 338, + 6, 0, 0, 0, 7, 8, 0, 0, 0, 9, + 10, 0, 152, 11, 0, 12, 13, 0, 351, 14, + 153, 0, 154, 356, 0, 0, 0, 15, 0, 0, + 0, 0, 0, 16, 0, 17, 373, 374, 375, 376, + 377, 0, 18, 19, 155, 0, 20, 344, 0, 0, + 21, 22, 0, 0, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, + 26, 0, 0, 0, 0, 0, 156, 157, 158, 0, + 159, 160, 27, 0, 161, 28, 0, 29, 0, 30, + 31, 0, 0, 0, 0, 0, 32, 0, 0, 0, + 33, 34, 162, 35, 36, 0, 37, 0, 38, 0, + 0, 0, 0, 0, 39, 0, 0, 0, 40, 41, + 42, 0, 43, 44, 0, 45, 46, 0, 0, 0, + 0, 2, 0, 0, -6, 47, 3, 4, 5, 0, + 0, 6, 0, 0, 0, 7, 8, 0, 0, 0, + 9, 10, 0, 0, 11, 0, 12, 13, 0, 0, + 14, 0, 0, 0, 0, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 16, 0, 17, 0, 0, 0, + 0, 252, 0, 18, 19, 0, 253, 20, 0, 0, + 254, 21, 22, 0, 0, 23, 24, 0, 0, 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, 0, 33, 0, 0, 0, 34, - 35, 0, 36, 37, 0, 38, 0, 39, 0, 0, - 0, 0, 0, 40, 0, 0, 0, 41, 42, 43, - 0, 44, 45, 0, 46, 47, 0, 0, 0, 2, - 3, 0, 0, -6, 48, 4, 5, 6, 0, 0, - 7, 0, 0, 0, 8, 9, 0, 0, 0, 10, - 11, 0, 0, 12, 0, 13, 14, 0, 0, 15, - 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 17, 0, 18, 0, 0, 0, 0, - 0, 0, 19, 20, 0, 0, 21, 0, 0, 0, - 22, 23, 0, 0, 24, 25, 0, 0, 254, 0, - 0, 0, 0, 255, 0, 0, 0, 256, 0, 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, 0, 33, 0, 257, - 0, 34, 35, 0, 36, 37, 0, 38, 0, 39, - 258, 0, 0, 0, 0, 40, 0, 299, 0, 41, - 42, 43, 0, 44, 45, 300, 46, 47, 0, 259, - 0, 0, 0, 260, 0, 261, 48, 301, 302, 0, - 303, 154, 0, 0, 0, 262, 304, 0, 0, 155, - 0, 156, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 263, 264, 0, 0, 305, 0, 306, 307, 0, - 308, 309, 310, 157, 311, 0, 0, 0, 0, 0, + 25, 26, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 27, 0, 0, 28, 0, 29, 0, + 30, 31, 0, 256, 0, 0, 0, 32, 0, 0, + 0, 33, 34, 0, 35, 36, 0, 37, 0, 38, + 0, 0, 257, 0, 297, 39, 258, 0, 259, 40, + 41, 42, 298, 43, 44, 0, 45, 46, 260, 0, + 0, 0, 0, 0, 299, 300, 47, 301, 0, 0, + 0, 0, 0, 302, 261, 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 265, 0, 266, 0, 0, 0, 267, 0, 0, - 268, 0, 0, 0, 0, 158, 159, 160, 0, 161, - 162, 0, 0, 163, 0, 0, 0, 0, 0, 0, - 0, 312, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 164 + 0, 0, 303, 0, 304, 305, 0, 306, 307, 308, + 0, 309, 0, 263, 0, 264, 0, 0, 0, 265, + 0, 0, 266, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 310 }; static const yytype_int16 yycheck[] = { - 40, 35, 137, 5, 4, 50, 53, 35, 26, 43, - 26, 26, 6, 16, 3, 122, 10, 38, 9, 27, - 55, 30, 57, 17, 52, 33, 32, 29, 36, 93, - 155, 156, 35, 122, 153, 52, 25, 55, 102, 57, - 158, 52, 44, 52, 50, 47, 131, 52, 166, 131, - 53, 52, 55, 131, 54, 131, 56, 131, 66, 166, - 131, 67, 109, 131, 58, 131, 155, 156, 131, 131, - 46, 131, 117, 49, 52, 159, 160, 161, 162, 163, - 131, 89, 166, 131, 219, 220, 52, 131, 0, 131, - 81, 85, 153, 165, 85, 131, 131, 86, 131, 131, - 102, 52, 91, 52, 98, 145, 146, 147, 148, 149, - 150, 151, 140, 131, 52, 131, 131, 106, 158, 159, - 141, 161, 162, 126, 127, 52, 128, 129, 30, 20, - 1, 131, 126, 24, 131, 143, 7, 8, 114, 131, - 116, 131, 13, 14, 15, 121, 131, 18, 124, 74, - 164, 22, 23, 52, 52, 52, 27, 28, 52, 148, - 31, 150, 33, 34, 52, 52, 37, 52, 131, 153, - 210, 211, 131, 52, 45, 204, 205, 206, 207, 70, - 51, 316, 53, 38, 39, 40, 41, 131, 222, 60, + 39, 34, 135, 46, 5, 4, 49, 26, 35, 42, + 6, 26, 26, 15, 10, 9, 121, 27, 55, 53, + 57, 17, 52, 33, 49, 52, 36, 157, 29, 32, + 91, 3, 34, 37, 121, 165, 55, 30, 57, 100, + 154, 155, 152, 44, 20, 52, 47, 50, 24, 130, + 52, 130, 54, 25, 52, 54, 66, 56, 130, 52, + 165, 130, 58, 130, 67, 130, 130, 154, 155, 52, + 113, 130, 115, 130, 130, 109, 130, 120, 130, 89, + 123, 130, 130, 52, 217, 218, 0, 81, 164, 85, + 115, 85, 152, 130, 70, 130, 158, 159, 160, 161, + 162, 102, 98, 165, 143, 144, 145, 146, 147, 148, + 149, 130, 139, 130, 86, 130, 130, 156, 157, 91, + 159, 160, 124, 125, 130, 130, 127, 128, 104, 125, + 1, 130, 142, 52, 106, 139, 112, 8, 130, 52, + 116, 52, 13, 14, 15, 52, 30, 18, 130, 130, + 130, 22, 23, 74, 163, 131, 27, 28, 52, 135, + 31, 52, 33, 34, 52, 52, 37, 52, 130, 208, + 209, 52, 52, 152, 45, 147, 130, 149, 52, 130, + 51, 314, 53, 38, 39, 40, 41, 220, 52, 60, 61, 52, 52, 64, 52, 52, 52, 68, 69, 52, - 52, 72, 73, 159, 160, 161, 162, 163, 112, 164, - 164, 153, 26, 104, 248, 255, 87, 88, 52, 164, - 153, 157, 113, 158, 165, 164, 117, 164, 269, 100, - 153, 165, 103, 164, 105, 164, 107, 108, 164, 153, - 164, 132, 164, 153, 115, 136, 84, 165, 119, 120, - 200, 122, 123, 98, 125, 212, 127, 13, 122, 152, - 45, 26, 133, 118, 250, 278, 137, 138, 139, 334, - 141, 142, 353, 144, 145, 130, 367, -1, -1, 134, - 135, -1, 153, 154, -1, -1, -1, -1, -1, -1, - 330, 331, -1, -1, -1, -1, -1, 7, 8, -1, - -1, -1, -1, 13, 14, 15, -1, -1, 18, -1, - -1, 351, 22, 23, -1, -1, 356, 27, 28, -1, - -1, 31, -1, 33, 34, -1, -1, 37, -1, 369, - 370, 371, 372, 373, -1, 45, -1, -1, -1, -1, - 343, 51, -1, 53, -1, -1, -1, -1, -1, -1, - 60, 61, -1, -1, 64, -1, -1, -1, 68, 69, - -1, -1, 72, 73, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 87, 88, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 100, -1, -1, 103, -1, 105, -1, 107, 108, -1, - -1, -1, -1, -1, -1, 115, -1, -1, -1, 119, - 120, -1, 122, 123, -1, 125, -1, 127, -1, -1, - -1, -1, -1, 133, -1, -1, -1, 137, 138, 139, - -1, 141, 142, -1, 144, 145, -1, -1, -1, 7, - 8, -1, -1, 153, 154, 13, 14, 15, -1, -1, + 163, 72, 73, 158, 159, 160, 161, 162, 152, 26, + 163, 163, 152, 246, 253, 164, 87, 88, 202, 203, + 204, 205, 156, 152, 163, 157, 163, 267, 164, 100, + 163, 82, 103, 163, 105, 163, 107, 108, 163, 163, + 152, 163, 152, 114, 96, 210, 12, 118, 119, 150, + 121, 122, 198, 124, 120, 126, 44, 248, 25, 349, + 276, 132, 117, 331, 363, 136, 137, 138, -1, 140, + 141, -1, 143, 144, 129, -1, -1, -1, 133, 134, + 8, 152, 153, -1, -1, 13, 14, 15, 327, 328, 18, -1, -1, -1, 22, 23, -1, -1, -1, 27, - 28, -1, -1, 31, -1, 33, 34, -1, -1, 37, - -1, -1, -1, -1, -1, -1, -1, 45, -1, -1, - -1, -1, -1, 51, -1, 53, -1, -1, -1, -1, - -1, -1, 60, 61, -1, -1, 64, -1, -1, -1, - 68, 69, -1, -1, 72, 73, -1, -1, 7, -1, - -1, -1, -1, 12, -1, -1, -1, 16, -1, 87, - 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 100, -1, -1, 103, -1, 105, -1, 107, - 108, -1, -1, -1, -1, -1, -1, 115, -1, 48, - -1, 119, 120, -1, 122, 123, -1, 125, -1, 127, - 59, -1, -1, -1, -1, 133, -1, 42, -1, 137, - 138, 139, -1, 141, 142, 50, 144, 145, -1, 78, - -1, -1, -1, 82, -1, 84, 154, 62, 63, -1, - 65, 11, -1, -1, -1, 94, 71, -1, -1, 19, - -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 110, 111, -1, -1, 90, -1, 92, 93, -1, - 95, 96, 97, 43, 99, -1, -1, -1, -1, -1, + 28, -1, 11, 31, -1, 33, 34, -1, 347, 37, + 19, -1, 21, 352, -1, -1, -1, 45, -1, -1, + -1, -1, -1, 51, -1, 53, 365, 366, 367, 368, + 369, -1, 60, 61, 43, -1, 64, 339, -1, -1, + 68, 69, -1, -1, 72, 73, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, + 88, -1, -1, -1, -1, -1, 75, 76, 77, -1, + 79, 80, 100, -1, 83, 103, -1, 105, -1, 107, + 108, -1, -1, -1, -1, -1, 114, -1, -1, -1, + 118, 119, 101, 121, 122, -1, 124, -1, 126, -1, + -1, -1, -1, -1, 132, -1, -1, -1, 136, 137, + 138, -1, 140, 141, -1, 143, 144, -1, -1, -1, + -1, 8, -1, -1, 152, 153, 13, 14, 15, -1, + -1, 18, -1, -1, -1, 22, 23, -1, -1, -1, + 27, 28, -1, -1, 31, -1, 33, 34, -1, -1, + 37, -1, -1, -1, -1, -1, -1, -1, 45, -1, + -1, -1, -1, -1, 51, -1, 53, -1, -1, -1, + -1, 7, -1, 60, 61, -1, 12, 64, -1, -1, + 16, 68, 69, -1, -1, 72, 73, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 87, 88, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 48, 100, -1, -1, 103, -1, 105, -1, + 107, 108, -1, 59, -1, -1, -1, 114, -1, -1, + -1, 118, 119, -1, 121, 122, -1, 124, -1, 126, + -1, -1, 78, -1, 42, 132, 82, -1, 84, 136, + 137, 138, 50, 140, 141, -1, 143, 144, 94, -1, + -1, -1, -1, -1, 62, 63, 153, 65, -1, -1, + -1, -1, -1, 71, 110, 111, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 140, -1, 142, -1, -1, -1, 146, -1, -1, - 149, -1, -1, -1, -1, 75, 76, 77, -1, 79, - 80, -1, -1, 83, -1, -1, -1, -1, -1, -1, - -1, 146, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 101 + -1, -1, 90, -1, 92, 93, -1, 95, 96, 97, + -1, 99, -1, 139, -1, 141, -1, -1, -1, 145, + -1, -1, 148, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 145 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 1, 7, 8, 13, 14, 15, 18, 22, 23, - 27, 28, 31, 33, 34, 37, 45, 51, 53, 60, - 61, 64, 68, 69, 72, 73, 87, 88, 100, 103, - 105, 107, 108, 115, 119, 120, 122, 123, 125, 127, - 133, 137, 138, 139, 141, 142, 144, 145, 154, 168, - 169, 170, 171, 172, 177, 178, 179, 180, 184, 187, - 193, 198, 201, 204, 207, 214, 215, 223, 224, 153, - 52, 52, 30, 52, 222, 52, 52, 46, 49, 114, - 116, 121, 124, 181, 182, 183, 6, 10, 17, 58, - 85, 98, 126, 202, 203, 9, 81, 85, 196, 197, - 131, 208, 202, 20, 24, 70, 104, 113, 117, 132, - 136, 189, 55, 57, 131, 173, 174, 131, 131, 131, - 131, 131, 212, 213, 131, 173, 220, 220, 131, 131, - 219, 131, 131, 52, 26, 55, 57, 173, 174, 131, - 209, 188, 189, 131, 222, 5, 29, 44, 47, 102, - 128, 129, 205, 206, 11, 19, 21, 43, 75, 76, - 77, 79, 80, 83, 101, 185, 186, 174, 52, 218, - 218, 0, 170, 153, 173, 173, 32, 50, 67, 217, - 165, 131, 131, 131, 131, 52, 131, 183, 203, 52, - 52, 52, 197, 30, 27, 33, 36, 66, 89, 143, - 190, 191, 131, 131, 38, 39, 40, 41, 118, 130, - 134, 135, 199, 200, 170, 213, 173, 131, 194, 26, - 26, 194, 74, 164, 189, 222, 222, 222, 222, 222, - 222, 222, 206, 52, 52, 35, 52, 140, 221, 52, - 222, 222, 52, 222, 222, 52, 52, 186, 53, 109, - 210, 211, 52, 153, 7, 12, 16, 48, 59, 78, - 82, 84, 94, 110, 111, 140, 142, 146, 149, 175, - 176, 4, 54, 56, 131, 216, 155, 156, 225, 226, - 131, 3, 25, 86, 91, 106, 148, 150, 192, 191, - 221, 221, 221, 221, 131, 52, 222, 222, 200, 42, - 50, 62, 63, 65, 71, 90, 92, 93, 95, 96, - 97, 99, 146, 195, 194, 194, 174, 131, 174, 52, - 211, 222, 52, 52, 52, 52, 52, 52, 176, 112, - 164, 164, 122, 226, 227, 228, 230, 153, 194, 26, - 52, 222, 222, 164, 153, 166, 228, 165, 173, 157, - 229, 164, 158, 231, 232, 222, 164, 166, 232, 153, - 222, 165, 159, 160, 161, 162, 163, 233, 234, 164, - 164, 164, 164, 164, 166, 234, 153, 222, 222, 222, - 222, 222, 153 + 0, 1, 8, 13, 14, 15, 18, 22, 23, 27, + 28, 31, 33, 34, 37, 45, 51, 53, 60, 61, + 64, 68, 69, 72, 73, 87, 88, 100, 103, 105, + 107, 108, 114, 118, 119, 121, 122, 124, 126, 132, + 136, 137, 138, 140, 141, 143, 144, 153, 167, 168, + 169, 170, 171, 176, 177, 178, 179, 183, 186, 192, + 197, 200, 203, 206, 213, 214, 222, 223, 152, 52, + 30, 52, 221, 52, 52, 46, 49, 113, 115, 120, + 123, 180, 181, 182, 6, 10, 17, 58, 85, 98, + 125, 201, 202, 9, 81, 85, 195, 196, 130, 207, + 201, 20, 24, 70, 104, 112, 116, 131, 135, 188, + 55, 57, 130, 172, 173, 130, 130, 130, 130, 130, + 211, 212, 130, 172, 219, 219, 130, 130, 218, 130, + 130, 52, 26, 55, 57, 172, 173, 130, 208, 187, + 188, 130, 221, 5, 29, 44, 47, 102, 127, 128, + 204, 205, 11, 19, 21, 43, 75, 76, 77, 79, + 80, 83, 101, 184, 185, 173, 52, 217, 217, 0, + 169, 152, 172, 172, 32, 50, 67, 216, 164, 130, + 130, 130, 130, 52, 130, 182, 202, 52, 52, 52, + 196, 30, 27, 33, 36, 66, 89, 142, 189, 190, + 130, 130, 38, 39, 40, 41, 117, 129, 133, 134, + 198, 199, 169, 212, 172, 130, 193, 26, 26, 193, + 74, 163, 188, 221, 221, 221, 221, 221, 221, 221, + 205, 52, 52, 35, 52, 139, 220, 52, 221, 221, + 52, 221, 221, 52, 52, 185, 53, 109, 209, 210, + 52, 152, 7, 12, 16, 48, 59, 78, 82, 84, + 94, 110, 111, 139, 141, 145, 148, 174, 175, 4, + 54, 56, 130, 215, 154, 155, 224, 225, 130, 3, + 25, 86, 91, 106, 147, 149, 191, 190, 220, 220, + 220, 220, 130, 52, 221, 221, 199, 42, 50, 62, + 63, 65, 71, 90, 92, 93, 95, 96, 97, 99, + 145, 194, 193, 193, 173, 130, 173, 52, 210, 221, + 52, 52, 52, 52, 52, 52, 175, 163, 163, 121, + 225, 226, 227, 229, 152, 193, 26, 221, 221, 163, + 152, 165, 227, 164, 172, 156, 228, 163, 157, 230, + 231, 221, 163, 165, 231, 152, 221, 164, 158, 159, + 160, 161, 162, 232, 233, 163, 163, 163, 163, 163, + 165, 233, 152, 221, 221, 221, 221, 221, 152 }; #define yyerrok (yyerrstatus = 0) @@ -2176,7 +2162,7 @@ yyreduce: case 5: /* Line 1455 of yacc.c */ -#line 303 "ntp_parser.y" +#line 302 "ntp_parser.y" { /* I will need to incorporate much more fine grained * error messages. The following should suffice for @@ -2193,7 +2179,7 @@ yyreduce: case 19: /* Line 1455 of yacc.c */ -#line 337 "ntp_parser.y" +#line 336 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)); if (my_node) @@ -2204,7 +2190,7 @@ yyreduce: case 20: /* Line 1455 of yacc.c */ -#line 343 "ntp_parser.y" +#line 342 "ntp_parser.y" { struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL); if (my_node) @@ -2215,147 +2201,147 @@ yyreduce: case 27: /* Line 1455 of yacc.c */ -#line 360 "ntp_parser.y" +#line 359 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); } break; case 28: /* Line 1455 of yacc.c */ -#line 361 "ntp_parser.y" +#line 360 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); } break; case 29: /* Line 1455 of yacc.c */ -#line 365 "ntp_parser.y" +#line 364 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); } break; case 30: /* Line 1455 of yacc.c */ -#line 369 "ntp_parser.y" +#line 368 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 31: /* Line 1455 of yacc.c */ -#line 370 "ntp_parser.y" +#line 369 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 32: /* Line 1455 of yacc.c */ -#line 374 "ntp_parser.y" +#line 373 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_SKEY); } break; case 33: /* Line 1455 of yacc.c */ -#line 375 "ntp_parser.y" +#line 374 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 34: /* Line 1455 of yacc.c */ -#line 376 "ntp_parser.y" +#line 375 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_BURST); } break; case 35: /* Line 1455 of yacc.c */ -#line 377 "ntp_parser.y" +#line 376 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_IBURST); } break; case 36: /* Line 1455 of yacc.c */ -#line 378 "ntp_parser.y" +#line 377 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 37: /* Line 1455 of yacc.c */ -#line 379 "ntp_parser.y" +#line 378 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 38: /* Line 1455 of yacc.c */ -#line 380 "ntp_parser.y" +#line 379 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 39: /* Line 1455 of yacc.c */ -#line 381 "ntp_parser.y" +#line 380 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_NOSELECT); } break; case 40: /* Line 1455 of yacc.c */ -#line 382 "ntp_parser.y" +#line 381 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREEMPT); } break; case 41: /* Line 1455 of yacc.c */ -#line 383 "ntp_parser.y" +#line 382 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREFER); } break; case 42: /* Line 1455 of yacc.c */ -#line 384 "ntp_parser.y" +#line 383 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_TRUE); } break; case 43: /* Line 1455 of yacc.c */ -#line 385 "ntp_parser.y" +#line 384 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_XLEAVE); } break; case 44: /* Line 1455 of yacc.c */ -#line 386 "ntp_parser.y" +#line 385 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 45: /* Line 1455 of yacc.c */ -#line 387 "ntp_parser.y" +#line 386 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 46: /* Line 1455 of yacc.c */ -#line 388 "ntp_parser.y" +#line 387 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 47: /* Line 1455 of yacc.c */ -#line 398 "ntp_parser.y" +#line 397 "ntp_parser.y" { struct unpeer_node *my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); if (my_node) @@ -2366,42 +2352,42 @@ yyreduce: case 50: /* Line 1455 of yacc.c */ -#line 417 "ntp_parser.y" +#line 416 "ntp_parser.y" { cfgt.broadcastclient = 1; } break; case 51: /* Line 1455 of yacc.c */ -#line 419 "ntp_parser.y" +#line 418 "ntp_parser.y" { append_queue(cfgt.manycastserver, (yyvsp[(2) - (2)].Queue)); } break; case 52: /* Line 1455 of yacc.c */ -#line 421 "ntp_parser.y" +#line 420 "ntp_parser.y" { append_queue(cfgt.multicastclient, (yyvsp[(2) - (2)].Queue)); } break; case 53: /* Line 1455 of yacc.c */ -#line 432 "ntp_parser.y" - { cfgt.auth.autokey = (yyvsp[(2) - (2)].Integer); } +#line 431 "ntp_parser.y" + { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; case 54: /* Line 1455 of yacc.c */ -#line 434 "ntp_parser.y" +#line 433 "ntp_parser.y" { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; case 55: /* Line 1455 of yacc.c */ -#line 436 "ntp_parser.y" +#line 435 "ntp_parser.y" { cryptosw++; append_queue(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue)); @@ -2411,217 +2397,217 @@ yyreduce: case 56: /* Line 1455 of yacc.c */ -#line 441 "ntp_parser.y" +#line 440 "ntp_parser.y" { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; case 57: /* Line 1455 of yacc.c */ -#line 443 "ntp_parser.y" +#line 442 "ntp_parser.y" { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; case 58: /* Line 1455 of yacc.c */ -#line 445 "ntp_parser.y" +#line 444 "ntp_parser.y" { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; case 59: /* Line 1455 of yacc.c */ -#line 447 "ntp_parser.y" +#line 446 "ntp_parser.y" { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue); } break; case 60: /* Line 1455 of yacc.c */ -#line 449 "ntp_parser.y" +#line 448 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; case 62: /* Line 1455 of yacc.c */ -#line 455 "ntp_parser.y" +#line 454 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; case 63: /* Line 1455 of yacc.c */ -#line 459 "ntp_parser.y" +#line 458 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 64: /* Line 1455 of yacc.c */ -#line 460 "ntp_parser.y" +#line 459 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 65: /* Line 1455 of yacc.c */ -#line 465 "ntp_parser.y" +#line 464 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PRIV, (yyvsp[(2) - (2)].String)); } break; case 66: /* Line 1455 of yacc.c */ -#line 467 "ntp_parser.y" +#line 466 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_IDENT, (yyvsp[(2) - (2)].String)); } break; case 67: /* Line 1455 of yacc.c */ -#line 469 "ntp_parser.y" +#line 468 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PW, (yyvsp[(2) - (2)].String)); } break; case 68: /* Line 1455 of yacc.c */ -#line 471 "ntp_parser.y" +#line 470 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_RAND, (yyvsp[(2) - (2)].String)); } break; case 69: /* Line 1455 of yacc.c */ -#line 473 "ntp_parser.y" +#line 472 "ntp_parser.y" { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 70: /* Line 1455 of yacc.c */ -#line 475 "ntp_parser.y" +#line 474 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_SIGN, (yyvsp[(2) - (2)].String)); } break; case 71: /* Line 1455 of yacc.c */ -#line 485 "ntp_parser.y" +#line 484 "ntp_parser.y" { append_queue(cfgt.orphan_cmds,(yyvsp[(2) - (2)].Queue)); } break; case 72: /* Line 1455 of yacc.c */ -#line 489 "ntp_parser.y" +#line 488 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 73: /* Line 1455 of yacc.c */ -#line 490 "ntp_parser.y" +#line 489 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 74: /* Line 1455 of yacc.c */ -#line 495 "ntp_parser.y" +#line 494 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_CEILING, (double)(yyvsp[(2) - (2)].Integer)); } break; case 75: /* Line 1455 of yacc.c */ -#line 497 "ntp_parser.y" +#line 496 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_FLOOR, (double)(yyvsp[(2) - (2)].Integer)); } break; case 76: /* Line 1455 of yacc.c */ -#line 499 "ntp_parser.y" +#line 498 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_COHORT, (double)(yyvsp[(2) - (2)].Integer)); } break; case 77: /* Line 1455 of yacc.c */ -#line 501 "ntp_parser.y" +#line 500 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_ORPHAN, (double)(yyvsp[(2) - (2)].Integer)); } break; case 78: /* Line 1455 of yacc.c */ -#line 503 "ntp_parser.y" +#line 502 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINDISP, (yyvsp[(2) - (2)].Double)); } break; case 79: /* Line 1455 of yacc.c */ -#line 505 "ntp_parser.y" +#line 504 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXDIST, (yyvsp[(2) - (2)].Double)); } break; case 80: /* Line 1455 of yacc.c */ -#line 507 "ntp_parser.y" +#line 506 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINCLOCK, (yyvsp[(2) - (2)].Double)); } break; case 81: /* Line 1455 of yacc.c */ -#line 509 "ntp_parser.y" +#line 508 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXCLOCK, (yyvsp[(2) - (2)].Double)); } break; case 82: /* Line 1455 of yacc.c */ -#line 511 "ntp_parser.y" +#line 510 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MINSANE, (double)(yyvsp[(2) - (2)].Integer)); } break; case 83: /* Line 1455 of yacc.c */ -#line 513 "ntp_parser.y" +#line 512 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_BEACON, (double)(yyvsp[(2) - (2)].Integer)); } break; case 84: /* Line 1455 of yacc.c */ -#line 515 "ntp_parser.y" +#line 514 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(PROTO_MAXHOP, (double)(yyvsp[(2) - (2)].Integer)); } break; case 85: /* Line 1455 of yacc.c */ -#line 525 "ntp_parser.y" +#line 524 "ntp_parser.y" { append_queue(cfgt.stats_list, (yyvsp[(2) - (2)].Queue)); } break; case 86: /* Line 1455 of yacc.c */ -#line 527 "ntp_parser.y" +#line 526 "ntp_parser.y" { cfgt.stats_dir = (yyvsp[(2) - (2)].String); } break; case 87: /* Line 1455 of yacc.c */ -#line 529 "ntp_parser.y" +#line 528 "ntp_parser.y" { enqueue(cfgt.filegen_opts, create_filegen_node((yyvsp[(2) - (3)].VoidPtr), (yyvsp[(3) - (3)].Queue))); @@ -2631,182 +2617,182 @@ yyreduce: case 88: /* Line 1455 of yacc.c */ -#line 536 "ntp_parser.y" +#line 535 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; case 89: /* Line 1455 of yacc.c */ -#line 537 "ntp_parser.y" +#line 536 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].VoidPtr)); } break; case 90: /* Line 1455 of yacc.c */ -#line 542 "ntp_parser.y" +#line 541 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("clockstats"); } break; case 91: /* Line 1455 of yacc.c */ -#line 544 "ntp_parser.y" +#line 543 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("cryptostats"); } break; case 92: /* Line 1455 of yacc.c */ -#line 546 "ntp_parser.y" +#line 545 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("loopstats"); } break; case 93: /* Line 1455 of yacc.c */ -#line 548 "ntp_parser.y" +#line 547 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("peerstats"); } break; case 94: /* Line 1455 of yacc.c */ -#line 550 "ntp_parser.y" +#line 549 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("rawstats"); } break; case 95: /* Line 1455 of yacc.c */ -#line 552 "ntp_parser.y" +#line 551 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("sysstats"); } break; case 96: /* Line 1455 of yacc.c */ -#line 554 "ntp_parser.y" +#line 553 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("timingstats"); } break; case 97: /* Line 1455 of yacc.c */ -#line 556 "ntp_parser.y" +#line 555 "ntp_parser.y" { (yyval.VoidPtr) = create_pval("protostats"); } break; case 98: /* Line 1455 of yacc.c */ -#line 560 "ntp_parser.y" +#line 559 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 99: /* Line 1455 of yacc.c */ -#line 561 "ntp_parser.y" +#line 560 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 100: /* Line 1455 of yacc.c */ -#line 566 "ntp_parser.y" +#line 565 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(T_File, (yyvsp[(2) - (2)].String)); } break; case 101: /* Line 1455 of yacc.c */ -#line 568 "ntp_parser.y" +#line 567 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Type, (yyvsp[(2) - (2)].Integer)); } break; case 102: /* Line 1455 of yacc.c */ -#line 569 "ntp_parser.y" +#line 568 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 103: /* Line 1455 of yacc.c */ -#line 570 "ntp_parser.y" +#line 569 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 104: /* Line 1455 of yacc.c */ -#line 571 "ntp_parser.y" +#line 570 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 105: /* Line 1455 of yacc.c */ -#line 572 "ntp_parser.y" +#line 571 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 106: /* Line 1455 of yacc.c */ -#line 576 "ntp_parser.y" +#line 575 "ntp_parser.y" { (yyval.Integer) = FILEGEN_NONE; } break; case 107: /* Line 1455 of yacc.c */ -#line 577 "ntp_parser.y" +#line 576 "ntp_parser.y" { (yyval.Integer) = FILEGEN_PID; } break; case 108: /* Line 1455 of yacc.c */ -#line 578 "ntp_parser.y" +#line 577 "ntp_parser.y" { (yyval.Integer) = FILEGEN_DAY; } break; case 109: /* Line 1455 of yacc.c */ -#line 579 "ntp_parser.y" +#line 578 "ntp_parser.y" { (yyval.Integer) = FILEGEN_WEEK; } break; case 110: /* Line 1455 of yacc.c */ -#line 580 "ntp_parser.y" +#line 579 "ntp_parser.y" { (yyval.Integer) = FILEGEN_MONTH; } break; case 111: /* Line 1455 of yacc.c */ -#line 581 "ntp_parser.y" +#line 580 "ntp_parser.y" { (yyval.Integer) = FILEGEN_YEAR; } break; case 112: /* Line 1455 of yacc.c */ -#line 582 "ntp_parser.y" +#line 581 "ntp_parser.y" { (yyval.Integer) = FILEGEN_AGE; } break; case 113: /* Line 1455 of yacc.c */ -#line 592 "ntp_parser.y" +#line 591 "ntp_parser.y" { append_queue(cfgt.discard_opts, (yyvsp[(2) - (2)].Queue)); } @@ -2815,7 +2801,7 @@ yyreduce: case 114: /* Line 1455 of yacc.c */ -#line 596 "ntp_parser.y" +#line 595 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); @@ -2825,7 +2811,7 @@ yyreduce: case 115: /* Line 1455 of yacc.c */ -#line 601 "ntp_parser.y" +#line 600 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no)); @@ -2835,7 +2821,7 @@ yyreduce: case 116: /* Line 1455 of yacc.c */ -#line 606 "ntp_parser.y" +#line 605 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2853,7 +2839,7 @@ yyreduce: case 117: /* Line 1455 of yacc.c */ -#line 619 "ntp_parser.y" +#line 618 "ntp_parser.y" { enqueue(cfgt.restrict_opts, create_restrict_node( @@ -2871,7 +2857,7 @@ yyreduce: case 118: /* Line 1455 of yacc.c */ -#line 632 "ntp_parser.y" +#line 631 "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)); @@ -2881,378 +2867,378 @@ yyreduce: case 119: /* Line 1455 of yacc.c */ -#line 639 "ntp_parser.y" +#line 638 "ntp_parser.y" { (yyval.Queue) = create_queue(); } break; case 120: /* Line 1455 of yacc.c */ -#line 640 "ntp_parser.y" +#line 639 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); } break; case 121: /* Line 1455 of yacc.c */ -#line 644 "ntp_parser.y" +#line 643 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_TIMEOUT); } break; case 122: /* Line 1455 of yacc.c */ -#line 645 "ntp_parser.y" +#line 644 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_IGNORE); } break; case 123: /* Line 1455 of yacc.c */ -#line 646 "ntp_parser.y" +#line 645 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_KOD); } break; case 124: /* Line 1455 of yacc.c */ -#line 647 "ntp_parser.y" +#line 646 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_MSSNTP); } break; case 125: /* Line 1455 of yacc.c */ -#line 648 "ntp_parser.y" +#line 647 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LIMITED); } break; case 126: /* Line 1455 of yacc.c */ -#line 649 "ntp_parser.y" +#line 648 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_LPTRAP); } break; case 127: /* Line 1455 of yacc.c */ -#line 650 "ntp_parser.y" +#line 649 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOMODIFY); } break; case 128: /* Line 1455 of yacc.c */ -#line 651 "ntp_parser.y" +#line 650 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOPEER); } break; case 129: /* Line 1455 of yacc.c */ -#line 652 "ntp_parser.y" +#line 651 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOQUERY); } break; case 130: /* Line 1455 of yacc.c */ -#line 653 "ntp_parser.y" +#line 652 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTSERVE); } break; case 131: /* Line 1455 of yacc.c */ -#line 654 "ntp_parser.y" +#line 653 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_NOTRAP); } break; case 132: /* Line 1455 of yacc.c */ -#line 655 "ntp_parser.y" +#line 654 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_DONTTRUST); } break; case 133: /* Line 1455 of yacc.c */ -#line 656 "ntp_parser.y" +#line 655 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RESM_NTPONLY); } break; case 134: /* Line 1455 of yacc.c */ -#line 657 "ntp_parser.y" +#line 656 "ntp_parser.y" { (yyval.VoidPtr) = create_ival(RES_VERSION); } break; case 135: /* Line 1455 of yacc.c */ -#line 661 "ntp_parser.y" +#line 660 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 136: /* Line 1455 of yacc.c */ -#line 662 "ntp_parser.y" +#line 661 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 137: /* Line 1455 of yacc.c */ -#line 666 "ntp_parser.y" +#line 665 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 138: /* Line 1455 of yacc.c */ -#line 667 "ntp_parser.y" +#line 666 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 139: /* Line 1455 of yacc.c */ -#line 668 "ntp_parser.y" +#line 667 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 140: /* Line 1455 of yacc.c */ -#line 677 "ntp_parser.y" +#line 676 "ntp_parser.y" { enqueue(cfgt.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; case 141: /* Line 1455 of yacc.c */ -#line 681 "ntp_parser.y" +#line 680 "ntp_parser.y" { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 142: /* Line 1455 of yacc.c */ -#line 682 "ntp_parser.y" +#line 681 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 143: /* Line 1455 of yacc.c */ -#line 687 "ntp_parser.y" +#line 686 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME1, (yyvsp[(2) - (2)].Double)); } break; case 144: /* Line 1455 of yacc.c */ -#line 689 "ntp_parser.y" +#line 688 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME2, (yyvsp[(2) - (2)].Double)); } break; case 145: /* Line 1455 of yacc.c */ -#line 691 "ntp_parser.y" +#line 690 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEVAL1, (yyvsp[(2) - (2)].Integer)); } break; case 146: /* Line 1455 of yacc.c */ -#line 693 "ntp_parser.y" +#line 692 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval(CLK_HAVEVAL2, (yyvsp[(2) - (2)].String)); } break; case 147: /* Line 1455 of yacc.c */ -#line 695 "ntp_parser.y" +#line 694 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG1, (yyvsp[(2) - (2)].Integer)); } break; case 148: /* Line 1455 of yacc.c */ -#line 697 "ntp_parser.y" +#line 696 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG2, (yyvsp[(2) - (2)].Integer)); } break; case 149: /* Line 1455 of yacc.c */ -#line 699 "ntp_parser.y" +#line 698 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG3, (yyvsp[(2) - (2)].Integer)); } break; case 150: /* Line 1455 of yacc.c */ -#line 701 "ntp_parser.y" +#line 700 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG4, (yyvsp[(2) - (2)].Integer)); } break; case 151: /* Line 1455 of yacc.c */ -#line 710 "ntp_parser.y" +#line 709 "ntp_parser.y" { append_queue(cfgt.enable_opts, (yyvsp[(2) - (2)].Queue)); } break; case 152: /* Line 1455 of yacc.c */ -#line 712 "ntp_parser.y" +#line 711 "ntp_parser.y" { append_queue(cfgt.disable_opts, (yyvsp[(2) - (2)].Queue)); } break; case 153: /* Line 1455 of yacc.c */ -#line 716 "ntp_parser.y" +#line 715 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 154: /* Line 1455 of yacc.c */ -#line 717 "ntp_parser.y" +#line 716 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 155: /* Line 1455 of yacc.c */ -#line 721 "ntp_parser.y" +#line 720 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 156: /* Line 1455 of yacc.c */ -#line 722 "ntp_parser.y" +#line 721 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 157: /* Line 1455 of yacc.c */ -#line 723 "ntp_parser.y" +#line 722 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 158: /* Line 1455 of yacc.c */ -#line 724 "ntp_parser.y" +#line 723 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 159: /* Line 1455 of yacc.c */ -#line 725 "ntp_parser.y" +#line 724 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 160: /* Line 1455 of yacc.c */ -#line 726 "ntp_parser.y" +#line 725 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 161: /* Line 1455 of yacc.c */ -#line 727 "ntp_parser.y" +#line 726 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 162: /* Line 1455 of yacc.c */ -#line 735 "ntp_parser.y" +#line 734 "ntp_parser.y" { append_queue(cfgt.tinker, (yyvsp[(2) - (2)].Queue)); } break; case 163: /* Line 1455 of yacc.c */ -#line 739 "ntp_parser.y" +#line 738 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; case 164: /* Line 1455 of yacc.c */ -#line 740 "ntp_parser.y" +#line 739 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; case 165: /* Line 1455 of yacc.c */ -#line 744 "ntp_parser.y" +#line 743 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_ALLAN, (yyvsp[(2) - (2)].Double)); } break; case 166: /* Line 1455 of yacc.c */ -#line 745 "ntp_parser.y" +#line 744 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PHI, (yyvsp[(2) - (2)].Double)); } break; case 167: /* Line 1455 of yacc.c */ -#line 746 "ntp_parser.y" +#line 745 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_FREQ, (yyvsp[(2) - (2)].Double)); } break; case 168: /* Line 1455 of yacc.c */ -#line 747 "ntp_parser.y" +#line 746 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_HUFFPUFF, (yyvsp[(2) - (2)].Double)); } break; case 169: /* Line 1455 of yacc.c */ -#line 748 "ntp_parser.y" +#line 747 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_PANIC, (yyvsp[(2) - (2)].Double)); } break; case 170: /* Line 1455 of yacc.c */ -#line 749 "ntp_parser.y" +#line 748 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MAX, (yyvsp[(2) - (2)].Double)); } break; case 171: /* Line 1455 of yacc.c */ -#line 750 "ntp_parser.y" +#line 749 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval(LOOP_MINSTEP, (yyvsp[(2) - (2)].Double)); } break; case 173: /* Line 1455 of yacc.c */ -#line 761 "ntp_parser.y" +#line 760 "ntp_parser.y" { if (curr_include_level >= MAXINCLUDELEVEL) { fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); @@ -3273,7 +3259,7 @@ yyreduce: case 174: /* Line 1455 of yacc.c */ -#line 777 "ntp_parser.y" +#line 776 "ntp_parser.y" { while (curr_include_level != -1) FCLOSE(fp[curr_include_level--]); @@ -3283,49 +3269,49 @@ yyreduce: case 175: /* Line 1455 of yacc.c */ -#line 783 "ntp_parser.y" +#line 782 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; case 176: /* Line 1455 of yacc.c */ -#line 785 "ntp_parser.y" +#line 784 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } break; case 177: /* Line 1455 of yacc.c */ -#line 787 "ntp_parser.y" +#line 786 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double))); } break; case 178: /* Line 1455 of yacc.c */ -#line 789 "ntp_parser.y" +#line 788 "ntp_parser.y" { /* Null action, possibly all null parms */ } break; case 179: /* Line 1455 of yacc.c */ -#line 791 "ntp_parser.y" +#line 790 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; case 180: /* Line 1455 of yacc.c */ -#line 794 "ntp_parser.y" +#line 793 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; case 181: /* Line 1455 of yacc.c */ -#line 796 "ntp_parser.y" +#line 795 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; @@ -3333,140 +3319,133 @@ yyreduce: /* Line 1455 of yacc.c */ #line 798 "ntp_parser.y" - { enqueue(cfgt.vars, create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer))); } - break; - - case 183: - -/* Line 1455 of yacc.c */ -#line 801 "ntp_parser.y" { append_queue(cfgt.logconfig, (yyvsp[(2) - (2)].Queue)); } break; - case 184: + case 183: /* Line 1455 of yacc.c */ -#line 803 "ntp_parser.y" +#line 800 "ntp_parser.y" { append_queue(cfgt.phone, (yyvsp[(2) - (2)].Queue)); } break; - case 185: + case 184: /* Line 1455 of yacc.c */ -#line 805 "ntp_parser.y" +#line 802 "ntp_parser.y" { enqueue(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; - case 186: + case 185: /* Line 1455 of yacc.c */ -#line 807 "ntp_parser.y" +#line 804 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (2)].Address_node), NULL)); } break; - case 187: + case 186: /* Line 1455 of yacc.c */ -#line 809 "ntp_parser.y" +#line 806 "ntp_parser.y" { enqueue(cfgt.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue))); } break; - case 188: + case 187: /* Line 1455 of yacc.c */ -#line 811 "ntp_parser.y" +#line 808 "ntp_parser.y" { append_queue(cfgt.ttl, (yyvsp[(2) - (2)].Queue)); } break; - case 189: + case 188: /* Line 1455 of yacc.c */ -#line 813 "ntp_parser.y" +#line 810 "ntp_parser.y" { enqueue(cfgt.qos, create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String))); } break; - case 190: + case 189: /* Line 1455 of yacc.c */ -#line 818 "ntp_parser.y" +#line 815 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); } break; - case 191: + case 190: /* Line 1455 of yacc.c */ -#line 820 "ntp_parser.y" +#line 817 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double))); enqueue(cfgt.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); } break; - case 192: + case 191: /* Line 1455 of yacc.c */ -#line 823 "ntp_parser.y" +#line 820 "ntp_parser.y" { enqueue(cfgt.vars, create_attr_sval(T_Driftfile, "\0")); } break; - case 193: + case 192: /* Line 1455 of yacc.c */ -#line 828 "ntp_parser.y" +#line 825 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), DEF); } break; - case 194: + case 193: /* Line 1455 of yacc.c */ -#line 830 "ntp_parser.y" +#line 827 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); } break; - case 195: + case 194: /* Line 1455 of yacc.c */ -#line 835 "ntp_parser.y" +#line 832 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 196: + case 195: /* Line 1455 of yacc.c */ -#line 836 "ntp_parser.y" +#line 833 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 197: + case 196: /* Line 1455 of yacc.c */ -#line 840 "ntp_parser.y" +#line 837 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; - case 198: + case 197: /* Line 1455 of yacc.c */ -#line 841 "ntp_parser.y" +#line 838 "ntp_parser.y" { (yyval.Attr_val) = create_attr_pval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node)); } break; - case 199: + case 198: /* Line 1455 of yacc.c */ -#line 845 "ntp_parser.y" +#line 842 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); } break; - case 200: + case 199: /* Line 1455 of yacc.c */ -#line 846 "ntp_parser.y" +#line 843 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); } break; - case 201: + case 200: /* Line 1455 of yacc.c */ -#line 851 "ntp_parser.y" +#line 848 "ntp_parser.y" { char prefix = (yyvsp[(1) - (1)].String)[0]; char *type = (yyvsp[(1) - (1)].String) + 1; @@ -3480,82 +3459,72 @@ yyreduce: } break; - case 202: - -/* Line 1455 of yacc.c */ -#line 866 "ntp_parser.y" - { - enqueue(cfgt.nic_rules, - create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, -1, (yyvsp[(2) - (3)].Integer))); - } - break; - - case 203: + case 201: /* Line 1455 of yacc.c */ -#line 871 "ntp_parser.y" +#line 863 "ntp_parser.y" { enqueue(cfgt.nic_rules, - create_nic_rule_node(0, (yyvsp[(3) - (3)].String), -1, (yyvsp[(2) - (3)].Integer))); + create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer))); } break; - case 204: + case 202: /* Line 1455 of yacc.c */ -#line 876 "ntp_parser.y" +#line 868 "ntp_parser.y" { enqueue(cfgt.nic_rules, - create_nic_rule_node(0, (yyvsp[(3) - (5)].String), (yyvsp[(5) - (5)].Integer), (yyvsp[(2) - (5)].Integer))); + create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer))); } break; - case 213: + case 211: /* Line 1455 of yacc.c */ -#line 906 "ntp_parser.y" +#line 898 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); } break; - case 214: + case 212: /* Line 1455 of yacc.c */ -#line 907 "ntp_parser.y" +#line 899 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); } break; - case 215: + case 213: /* Line 1455 of yacc.c */ -#line 911 "ntp_parser.y" +#line 903 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); } break; - case 216: + case 214: /* Line 1455 of yacc.c */ -#line 912 "ntp_parser.y" +#line 904 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); } break; - case 217: + case 215: /* Line 1455 of yacc.c */ -#line 916 "ntp_parser.y" +#line 908 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); } break; - case 218: + case 216: /* Line 1455 of yacc.c */ -#line 917 "ntp_parser.y" +#line 909 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); } break; - case 219: + case 217: /* Line 1455 of yacc.c */ -#line 922 "ntp_parser.y" +#line 914 "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"); @@ -3566,31 +3535,31 @@ yyreduce: } break; - case 220: + case 218: /* Line 1455 of yacc.c */ -#line 930 "ntp_parser.y" +#line 922 "ntp_parser.y" { (yyval.Integer) = 1; } break; - case 221: + case 219: /* Line 1455 of yacc.c */ -#line 931 "ntp_parser.y" +#line 923 "ntp_parser.y" { (yyval.Integer) = 0; } break; - case 222: + case 220: /* Line 1455 of yacc.c */ -#line 935 "ntp_parser.y" +#line 927 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; - case 224: + case 222: /* Line 1455 of yacc.c */ -#line 946 "ntp_parser.y" +#line 938 "ntp_parser.y" { cfgt.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue)); @@ -3599,150 +3568,150 @@ yyreduce: } break; - case 225: + case 223: /* Line 1455 of yacc.c */ -#line 960 "ntp_parser.y" +#line 952 "ntp_parser.y" { old_config_style = 0; } break; - case 226: + case 224: /* Line 1455 of yacc.c */ -#line 964 "ntp_parser.y" +#line 956 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 227: + case 225: /* Line 1455 of yacc.c */ -#line 965 "ntp_parser.y" +#line 957 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 228: + case 226: /* Line 1455 of yacc.c */ -#line 969 "ntp_parser.y" +#line 961 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 229: + case 227: /* Line 1455 of yacc.c */ -#line 970 "ntp_parser.y" +#line 962 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 230: + case 228: /* Line 1455 of yacc.c */ -#line 974 "ntp_parser.y" +#line 966 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); } break; - case 231: + case 229: /* Line 1455 of yacc.c */ -#line 975 "ntp_parser.y" +#line 967 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); } break; - case 232: + case 230: /* Line 1455 of yacc.c */ -#line 980 "ntp_parser.y" +#line 972 "ntp_parser.y" { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); } break; - case 233: + case 231: /* Line 1455 of yacc.c */ -#line 984 "ntp_parser.y" +#line 976 "ntp_parser.y" { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; - case 234: + case 232: /* Line 1455 of yacc.c */ -#line 988 "ntp_parser.y" +#line 980 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; - case 235: + case 233: /* Line 1455 of yacc.c */ -#line 992 "ntp_parser.y" +#line 984 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); } break; - case 236: + case 234: /* Line 1455 of yacc.c */ -#line 993 "ntp_parser.y" +#line 985 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); } break; - case 237: + case 235: /* Line 1455 of yacc.c */ -#line 998 "ntp_parser.y" +#line 990 "ntp_parser.y" { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); } break; - case 238: + case 236: /* Line 1455 of yacc.c */ -#line 1002 "ntp_parser.y" +#line 994 "ntp_parser.y" { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); } break; - case 239: + case 237: /* Line 1455 of yacc.c */ -#line 1003 "ntp_parser.y" +#line 995 "ntp_parser.y" { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); } break; - case 240: + case 238: /* Line 1455 of yacc.c */ -#line 1008 "ntp_parser.y" +#line 1000 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 241: + case 239: /* Line 1455 of yacc.c */ -#line 1010 "ntp_parser.y" +#line 1002 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 242: + case 240: /* Line 1455 of yacc.c */ -#line 1012 "ntp_parser.y" +#line 1004 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 243: + case 241: /* Line 1455 of yacc.c */ -#line 1014 "ntp_parser.y" +#line 1006 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; - case 244: + case 242: /* Line 1455 of yacc.c */ -#line 1016 "ntp_parser.y" +#line 1008 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; /* Line 1455 of yacc.c */ -#line 3746 "ntp_parser.c" +#line 3715 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3954,7 +3923,7 @@ yyreturn: /* Line 1675 of yacc.c */ -#line 1020 "ntp_parser.y" +#line 1012 "ntp_parser.y" void yyerror (char *msg) diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h index cc338ce48..c9b8221c1 100644 --- a/ntpd/ntp_parser.h +++ b/ntpd/ntp_parser.h @@ -148,58 +148,57 @@ T_Port = 364, T_Preempt = 365, T_Prefer = 366, - T_Prefixlen = 367, - T_Protostats = 368, - T_Pw = 369, - T_Qos = 370, - T_RandFile = 371, - T_Rawstats = 372, - T_Refid = 373, - T_Requestkey = 374, - T_Restrict = 375, - T_Revoke = 376, - T_Server = 377, - T_Setvar = 378, - T_Sign = 379, - T_Statistics = 380, - T_Stats = 381, - T_Statsdir = 382, - T_Step = 383, - T_Stepout = 384, - T_Stratum = 385, - T_String = 386, - T_Sysstats = 387, - T_Tick = 388, - T_Time1 = 389, - T_Time2 = 390, - T_Timingstats = 391, - T_Tinker = 392, - T_Tos = 393, - T_Trap = 394, - T_True = 395, - T_Trustedkey = 396, - T_Ttl = 397, - T_Type = 398, - T_Unconfig = 399, - T_Unpeer = 400, - T_Version = 401, - T_WanderThreshold = 402, - T_Week = 403, - T_Xleave = 404, - T_Year = 405, - T_Flag = 406, - T_Void = 407, - T_EOC = 408, - T_Simulate = 409, - T_Beep_Delay = 410, - T_Sim_Duration = 411, - T_Server_Offset = 412, - T_Duration = 413, - T_Freq_Offset = 414, - T_Wander = 415, - T_Jitter = 416, - T_Prop_Delay = 417, - T_Proc_Delay = 418 + T_Protostats = 367, + T_Pw = 368, + T_Qos = 369, + T_RandFile = 370, + T_Rawstats = 371, + T_Refid = 372, + T_Requestkey = 373, + T_Restrict = 374, + T_Revoke = 375, + T_Server = 376, + T_Setvar = 377, + T_Sign = 378, + T_Statistics = 379, + T_Stats = 380, + T_Statsdir = 381, + T_Step = 382, + T_Stepout = 383, + T_Stratum = 384, + T_String = 385, + T_Sysstats = 386, + T_Tick = 387, + T_Time1 = 388, + T_Time2 = 389, + T_Timingstats = 390, + T_Tinker = 391, + T_Tos = 392, + T_Trap = 393, + T_True = 394, + T_Trustedkey = 395, + T_Ttl = 396, + T_Type = 397, + T_Unconfig = 398, + T_Unpeer = 399, + T_Version = 400, + T_WanderThreshold = 401, + T_Week = 402, + T_Xleave = 403, + T_Year = 404, + T_Flag = 405, + T_Void = 406, + T_EOC = 407, + T_Simulate = 408, + T_Beep_Delay = 409, + T_Sim_Duration = 410, + T_Server_Offset = 411, + T_Duration = 412, + T_Freq_Offset = 413, + T_Wander = 414, + T_Jitter = 415, + T_Prop_Delay = 416, + T_Proc_Delay = 417 }; #endif /* Tokens. */ @@ -312,58 +311,57 @@ #define T_Port 364 #define T_Preempt 365 #define T_Prefer 366 -#define T_Prefixlen 367 -#define T_Protostats 368 -#define T_Pw 369 -#define T_Qos 370 -#define T_RandFile 371 -#define T_Rawstats 372 -#define T_Refid 373 -#define T_Requestkey 374 -#define T_Restrict 375 -#define T_Revoke 376 -#define T_Server 377 -#define T_Setvar 378 -#define T_Sign 379 -#define T_Statistics 380 -#define T_Stats 381 -#define T_Statsdir 382 -#define T_Step 383 -#define T_Stepout 384 -#define T_Stratum 385 -#define T_String 386 -#define T_Sysstats 387 -#define T_Tick 388 -#define T_Time1 389 -#define T_Time2 390 -#define T_Timingstats 391 -#define T_Tinker 392 -#define T_Tos 393 -#define T_Trap 394 -#define T_True 395 -#define T_Trustedkey 396 -#define T_Ttl 397 -#define T_Type 398 -#define T_Unconfig 399 -#define T_Unpeer 400 -#define T_Version 401 -#define T_WanderThreshold 402 -#define T_Week 403 -#define T_Xleave 404 -#define T_Year 405 -#define T_Flag 406 -#define T_Void 407 -#define T_EOC 408 -#define T_Simulate 409 -#define T_Beep_Delay 410 -#define T_Sim_Duration 411 -#define T_Server_Offset 412 -#define T_Duration 413 -#define T_Freq_Offset 414 -#define T_Wander 415 -#define T_Jitter 416 -#define T_Prop_Delay 417 -#define T_Proc_Delay 418 +#define T_Protostats 367 +#define T_Pw 368 +#define T_Qos 369 +#define T_RandFile 370 +#define T_Rawstats 371 +#define T_Refid 372 +#define T_Requestkey 373 +#define T_Restrict 374 +#define T_Revoke 375 +#define T_Server 376 +#define T_Setvar 377 +#define T_Sign 378 +#define T_Statistics 379 +#define T_Stats 380 +#define T_Statsdir 381 +#define T_Step 382 +#define T_Stepout 383 +#define T_Stratum 384 +#define T_String 385 +#define T_Sysstats 386 +#define T_Tick 387 +#define T_Time1 388 +#define T_Time2 389 +#define T_Timingstats 390 +#define T_Tinker 391 +#define T_Tos 392 +#define T_Trap 393 +#define T_True 394 +#define T_Trustedkey 395 +#define T_Ttl 396 +#define T_Type 397 +#define T_Unconfig 398 +#define T_Unpeer 399 +#define T_Version 400 +#define T_WanderThreshold 401 +#define T_Week 402 +#define T_Xleave 403 +#define T_Year 404 +#define T_Flag 405 +#define T_Void 406 +#define T_EOC 407 +#define T_Simulate 408 +#define T_Beep_Delay 409 +#define T_Sim_Duration 410 +#define T_Server_Offset 411 +#define T_Duration 412 +#define T_Freq_Offset 413 +#define T_Wander 414 +#define T_Jitter 415 +#define T_Prop_Delay 416 +#define T_Proc_Delay 417 @@ -391,7 +389,7 @@ typedef union YYSTYPE /* Line 1676 of yacc.c */ -#line 395 "ntp_parser.h" +#line 393 "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 faaece6a8..bf40529ee 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -173,7 +173,6 @@ %token T_Port %token T_Preempt %token T_Prefer -%token T_Prefixlen %token T_Protostats %token T_Pw %token T_Qos @@ -428,8 +427,8 @@ other_mode_command */ authentication_command - : T_Autokey T_Integer - { cfgt.auth.autokey = $2; } + : T_Automax T_Integer + { enqueue(cfgt.vars, create_attr_ival($1, $2)); } | T_ControlKey T_Integer { cfgt.auth.control_key = $2; } | T_Crypto crypto_command_line @@ -794,8 +793,6 @@ miscellaneous_command { enqueue(cfgt.vars, create_attr_sval($1, $2)); } | T_Logfile T_String { enqueue(cfgt.vars, create_attr_sval($1, $2)); } - | T_Automax T_Integer - { enqueue(cfgt.vars, create_attr_ival($1, $2)); } | T_Logconfig log_config_list { append_queue(cfgt.logconfig, $2); } @@ -865,17 +862,12 @@ interface_command : interface_nic nic_rule_action nic_rule_class { enqueue(cfgt.nic_rules, - create_nic_rule_node($3, NULL, -1, $2)); + create_nic_rule_node($3, NULL, $2)); } | interface_nic nic_rule_action T_String { enqueue(cfgt.nic_rules, - create_nic_rule_node(0, $3, -1, $2)); - } - | interface_nic nic_rule_action T_String T_Prefixlen T_Integer - { - enqueue(cfgt.nic_rules, - create_nic_rule_node(0, $3, $5, $2)); + create_nic_rule_node(0, $3, $2)); } ;