From: Harlan Stenn Date: Sun, 18 Nov 2012 12:15:14 +0000 (+0000) Subject: rlimit cleanup X-Git-Tag: NTP_4_2_7P324~8^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79985a693283849a4686203db88d031ed9f19986;p=thirdparty%2Fntp.git rlimit cleanup bk: 50a8d152jD-7QZ-ocGzyv_87vkVWeg --- diff --git a/configure.ac b/configure.ac index 79339a8e9..0571a284d 100644 --- a/configure.ac +++ b/configure.ac @@ -188,60 +188,6 @@ AC_SEARCH_LIBS([openlog], [gen syslog]) NTP_FACILITYNAMES -# HMS: Only if we are doing the MLOCKALL stuff... -AC_MSG_CHECKING([for the default number of 4k stack pages]) -AC_ARG_WITH( - [stack-limit], - [AS_HELP_STRING( - [--with-stack-limit], - [? =50 (200 for openbsd) 4k pages] - )], - [ans=$withval], - [ans=yes] -) -case "$ans" in - yes | no) - case "$host" in - *-*-openbsd*) - ans=200 - ;; - *) ans=50 - ;; - esac - ;; - [1-9][0-9]*) - ;; - *) AC_MSG_ERROR(["--with-stack-limit requires an integer argument."]) - ;; -esac -AC_MSG_RESULT([$ans]) -AC_DEFINE_UNQUOTED([DFLT_RLIMIT_STACK], [$ans], - [Default number of 4k pages for RLIMIT_STACK]) - -# HMS: only if we have RLIMIT_MEMLOCK -AC_MSG_CHECKING([for the default number of megabytes to MEMLOCK]) -AC_ARG_WITH( - [memlock], - [AS_HELP_STRING( - [--with-memlock], - [? =32 (megabytes)] - )], - [ans=$withval], - [ans=yes] -) -case "$ans" in - yes | no) - ans=32 - ;; - [1-9][0-9]*) ;; - *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) - ;; -esac -AC_MSG_RESULT([$ans]) -AC_DEFINE_UNQUOTED([DFLT_RLIMIT_MEMLOCK], [$ans], - [Default number of megabytes for RLIMIT_MEMLOCK]) - - dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt dnl Solaris 2.6 only has -lposix4; in Solaris 7, this is a symlink to -lrt, dnl so only use one of them. Linux (glibc-2.1.2 and -2.2.2, at least) @@ -870,6 +816,62 @@ case "$host" in ;; esac +NTP_RLIMIT_ITEMS + +# HMS: Only if we are doing the MLOCKALL stuff... +AC_MSG_CHECKING([for the default number of 4k stack pages]) +AC_ARG_WITH( + [stack-limit], + [AS_HELP_STRING( + [--with-stack-limit], + [? =50 (200 for openbsd) 4k pages] + )], + [ans=$withval], + [ans=yes] +) +case "$ans" in + yes | no) + case "$host" in + *-*-openbsd*) + ans=200 + ;; + *) ans=50 + ;; + esac + ;; + [1-9][0-9]*) + ;; + *) AC_MSG_ERROR(["--with-stack-limit requires an integer argument."]) + ;; +esac +AC_MSG_RESULT([$ans]) +AC_DEFINE_UNQUOTED([DFLT_RLIMIT_STACK], [$ans], + [Default number of 4k pages for RLIMIT_STACK]) + +# HMS: only if we have RLIMIT_MEMLOCK +AC_MSG_CHECKING([for the default number of megabytes to MEMLOCK]) +AC_ARG_WITH( + [memlock], + [AS_HELP_STRING( + [--with-memlock], + [? =32 (megabytes)] + )], + [ans=$withval], + [ans=yes] +) +case "$ans" in + yes | no) + ans=32 + ;; + [1-9][0-9]*) ;; + *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) + ;; +esac +AC_MSG_RESULT([$ans]) +AC_DEFINE_UNQUOTED([DFLT_RLIMIT_MEMLOCK], [$ans], + [Default number of megabytes for RLIMIT_MEMLOCK]) + + # some OSes prefer _exit() in forked children to exit() AC_CHECK_FUNCS([_exit]) ntp_worker_child_exit=exit @@ -4235,6 +4237,7 @@ AC_CONFIG_FILES([kernel/sys/Makefile]) AC_CONFIG_FILES([libntp/Makefile]) AC_CONFIG_FILES([libparse/Makefile]) AC_CONFIG_FILES([ntpd/Makefile]) +AC_CONFIG_FILES([ntpd/complete.conf], [sed -i.old -e '/^rlimit$/d' ntpd/complete.conf]) AC_CONFIG_FILES([ntpdate/Makefile]) AC_CONFIG_FILES([ntpdc/Makefile]) AC_CONFIG_FILES([ntpdc/nl.pl], [chmod +x ntpdc/nl.pl]) diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am index 2b6e614d6..0424c5f6f 100644 --- a/ntpd/Makefile.am +++ b/ntpd/Makefile.am @@ -114,7 +114,7 @@ CLEANFILES = \ $(NULL) EXTRA_DIST = \ - complete.conf \ + complete.conf.in \ invoke-ntpd.menu \ invoke-ntpd.texi \ keyword-gen-utd \ @@ -357,12 +357,12 @@ $(srcdir)/invoke-ntpd.texi: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(PROGRAMS): $(LDADD) -compsave.conf: ntpd $(srcdir)/complete.conf - ./ntpd --configfile $(srcdir)/complete.conf --saveconfigquit $@ +compsave.conf: ntpd complete.conf + ./ntpd --configfile complete.conf --saveconfigquit $@ -check-saveconfig: $(srcdir)/complete.conf compsave.conf - -diff $(srcdir)/complete.conf compsave.conf - cmp $(srcdir)/complete.conf compsave.conf && echo stamp > $@ +check-saveconfig: complete.conf compsave.conf + -diff complete.conf compsave.conf + cmp complete.conf compsave.conf && echo stamp > $@ ../libntp/libntpsim.a: cd ../libntp && $(MAKE) $(AM_MAKEFLAGS) libntpsim.a diff --git a/ntpd/complete.conf b/ntpd/complete.conf.in similarity index 98% rename from ntpd/complete.conf rename to ntpd/complete.conf.in index 3f253549c..9ed02c9fa 100644 --- a/ntpd/complete.conf +++ b/ntpd/complete.conf.in @@ -23,8 +23,8 @@ controlkey 12 requestkey 12 enable auth ntp monitor disable bclient calibrate kernel mode7 -rlimit memlock 32 stack 50 tos beacon 3600 ceiling 16 cohort 0 floor 1 maxclock 10 maxdist 1.5 minclock 3 mindist 0.001 minsane 1 orphan 16 orphanwait 300 +rlimit@HAVE_RLIMIT_MEMLOCK@@HAVE_RLIMIT_STACK@ tinker allan 1500 dispersion 15 freq 0 huffpuff 7200 panic 1000 step 0.128 stepout 900 tick 0.01 broadcastclient server 127.127.1.0 mode 4294967295 prefer true diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c index 4ecb555ef..5e126d939 100644 --- a/ntpd/ntp_parser.c +++ b/ntpd/ntp_parser.c @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -102,7 +101,7 @@ /* Line 189 of yacc.c */ -#line 106 "../../ntpd/ntp_parser.c" +#line 105 "ntp_parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -533,7 +532,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 537 "../../ntpd/ntp_parser.c" +#line 536 "ntp_parser.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -545,7 +544,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 549 "../../ntpd/ntp_parser.c" +#line 548 "ntp_parser.c" #ifdef short # undef short @@ -595,7 +594,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -758,9 +757,9 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 201 +#define YYFINAL 202 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 584 +#define YYLAST 567 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 193 @@ -769,7 +768,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 306 /* YYNRULES -- Number of states. */ -#define YYNSTATES 409 +#define YYNSTATES 410 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -911,7 +910,7 @@ static const yytype_int16 yyrhs[] = 48, 199, 240, -1, 240, 241, -1, 241, -1, 242, 282, -1, 243, 281, -1, 151, 59, -1, 3, 152, -1, 135, 152, -1, 156, -1, 157, -1, 41, -1, - 42, -1, 43, -1, 44, -1, 160, 245, -1, 245, + 42, -1, 43, -1, 44, -1, 140, 245, -1, 245, 246, -1, 246, -1, 247, 59, -1, 91, -1, 145, -1, 36, 249, -1, 29, 249, -1, 249, 250, -1, 250, -1, 251, -1, 252, -1, 8, -1, 12, -1, @@ -1166,124 +1165,124 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 24, 58, 226, 0, 70, 0, 0, 236, 0, 219, 0, 0, 229, 0, 249, 0, 0, 230, 0, 232, 25, 0, 0, 0, 250, 227, 0, - 23, 0, 231, 22, 0, 0, 0, 0, 233, 21, - 0, 0, 0, 228, 0, 0, 0, 0, 0, 56, - 57, 285, 0, 2, 0, 7, 0, 8, 0, 9, - 10, 13, 11, 12, 14, 15, 16, 17, 18, 0, - 0, 0, 213, 0, 214, 19, 0, 5, 61, 62, - 63, 193, 194, 195, 196, 199, 197, 198, 200, 188, - 190, 191, 192, 153, 154, 155, 125, 151, 0, 234, - 220, 187, 100, 101, 102, 103, 107, 104, 105, 106, - 108, 29, 30, 28, 0, 26, 0, 6, 64, 65, - 246, 221, 245, 278, 59, 159, 160, 161, 162, 163, - 164, 165, 166, 126, 157, 0, 60, 69, 276, 222, - 66, 261, 262, 263, 264, 265, 266, 267, 258, 260, - 133, 29, 30, 133, 133, 26, 67, 0, 223, 95, - 99, 96, 205, 206, 207, 208, 185, 209, 186, 210, - 211, 212, 181, 183, 0, 201, 203, 0, 90, 85, - 0, 86, 94, 92, 93, 91, 89, 87, 88, 79, - 81, 0, 0, 240, 272, 0, 68, 271, 273, 269, - 225, 1, 0, 4, 31, 55, 283, 282, 215, 216, - 217, 257, 256, 255, 0, 0, 78, 74, 75, 76, - 77, 0, 71, 0, 189, 150, 152, 235, 97, 0, - 177, 178, 179, 180, 0, 0, 175, 176, 167, 169, - 0, 0, 27, 218, 244, 277, 156, 158, 275, 259, - 129, 133, 133, 132, 127, 0, 0, 98, 182, 184, - 202, 204, 281, 279, 280, 84, 80, 82, 83, 224, - 0, 270, 268, 3, 20, 251, 252, 253, 248, 254, - 247, 289, 290, 0, 0, 0, 73, 72, 117, 116, - 0, 114, 115, 0, 109, 112, 113, 173, 174, 172, - 168, 170, 171, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 134, 130, - 131, 133, 239, 0, 0, 241, 0, 37, 38, 39, - 54, 47, 49, 48, 51, 40, 41, 42, 43, 50, - 52, 44, 32, 33, 36, 34, 0, 35, 0, 0, - 0, 0, 292, 0, 287, 0, 110, 124, 120, 122, - 118, 119, 121, 123, 111, 128, 238, 237, 243, 242, - 0, 45, 46, 53, 0, 286, 284, 291, 0, 288, - 274, 295, 0, 0, 0, 0, 0, 297, 0, 0, - 293, 296, 294, 0, 0, 302, 303, 304, 305, 306, - 0, 0, 0, 298, 0, 300, 0, 299, 301 + 23, 0, 231, 22, 0, 0, 0, 0, 0, 233, + 21, 0, 0, 0, 228, 0, 0, 0, 0, 0, + 56, 57, 285, 0, 2, 0, 7, 0, 8, 0, + 9, 10, 13, 11, 12, 14, 15, 16, 17, 18, + 0, 0, 0, 213, 0, 214, 19, 0, 5, 61, + 62, 63, 193, 194, 195, 196, 199, 197, 198, 200, + 188, 190, 191, 192, 153, 154, 155, 125, 151, 0, + 234, 220, 187, 100, 101, 102, 103, 107, 104, 105, + 106, 108, 29, 30, 28, 0, 26, 0, 6, 64, + 65, 246, 221, 245, 278, 59, 159, 160, 161, 162, + 163, 164, 165, 166, 126, 157, 0, 60, 69, 276, + 222, 66, 261, 262, 263, 264, 265, 266, 267, 258, + 260, 133, 29, 30, 133, 133, 26, 67, 185, 186, + 181, 183, 0, 0, 223, 95, 99, 96, 205, 206, + 207, 208, 209, 210, 211, 212, 201, 203, 0, 90, + 85, 0, 86, 94, 92, 93, 91, 89, 87, 88, + 79, 81, 0, 0, 240, 272, 0, 68, 271, 273, + 269, 225, 1, 0, 4, 31, 55, 283, 282, 215, + 216, 217, 257, 256, 255, 0, 0, 78, 74, 75, + 76, 77, 0, 71, 0, 189, 150, 152, 235, 97, + 0, 177, 178, 179, 180, 0, 0, 175, 176, 167, + 169, 0, 0, 27, 218, 244, 277, 156, 158, 275, + 259, 129, 133, 133, 132, 127, 0, 182, 184, 0, + 98, 202, 204, 281, 279, 280, 84, 80, 82, 83, + 224, 0, 270, 268, 3, 20, 251, 252, 253, 248, + 254, 247, 289, 290, 0, 0, 0, 73, 72, 117, + 116, 0, 114, 115, 0, 109, 112, 113, 173, 174, + 172, 168, 170, 171, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 134, + 130, 131, 133, 239, 0, 0, 241, 0, 37, 38, + 39, 54, 47, 49, 48, 51, 40, 41, 42, 43, + 50, 52, 44, 32, 33, 36, 34, 0, 35, 0, + 0, 0, 0, 292, 0, 287, 0, 110, 124, 120, + 122, 118, 119, 121, 123, 111, 128, 238, 237, 243, + 242, 0, 45, 46, 53, 0, 286, 284, 291, 0, + 288, 274, 295, 0, 0, 0, 0, 0, 297, 0, + 0, 293, 296, 294, 0, 0, 302, 303, 304, 305, + 306, 0, 0, 0, 298, 0, 300, 0, 299, 301 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 52, 53, 54, 55, 56, 123, 115, 116, 274, - 342, 343, 344, 345, 346, 347, 348, 57, 58, 59, - 60, 80, 222, 223, 61, 189, 190, 191, 192, 62, - 159, 110, 228, 294, 295, 296, 364, 63, 250, 318, - 96, 97, 98, 133, 134, 135, 64, 238, 239, 240, - 241, 65, 172, 173, 174, 66, 89, 90, 91, 92, - 67, 175, 176, 177, 68, 69, 70, 71, 100, 158, - 367, 269, 325, 121, 122, 72, 73, 280, 214, 74, - 148, 149, 200, 196, 197, 198, 139, 124, 265, 208, - 75, 76, 283, 284, 285, 351, 352, 383, 353, 386, - 387, 400, 401, 402 + -1, 53, 54, 55, 56, 57, 124, 116, 117, 275, + 343, 344, 345, 346, 347, 348, 349, 58, 59, 60, + 61, 81, 223, 224, 62, 190, 191, 192, 193, 63, + 165, 111, 229, 295, 296, 297, 365, 64, 251, 319, + 97, 98, 99, 134, 135, 136, 65, 239, 240, 241, + 242, 66, 160, 161, 162, 67, 90, 91, 92, 93, + 68, 176, 177, 178, 69, 70, 71, 72, 101, 164, + 368, 270, 326, 122, 123, 73, 74, 281, 215, 75, + 149, 150, 201, 197, 198, 199, 140, 125, 266, 209, + 76, 77, 284, 285, 286, 352, 353, 384, 354, 387, + 388, 401, 402, 403 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -176 +#define YYPACT_NINF -177 static const yytype_int16 yypact[] = { - 23, -159, -34, -176, -176, -176, -25, -176, 106, 3, - -111, 106, -176, 111, -43, -176, -109, -176, -104, -102, - -176, -95, -176, -176, -43, 462, -43, -176, -176, -91, - -176, -86, -176, -176, 17, 5, 4, 20, -176, -176, - -70, 111, -68, -176, 146, 464, -67, -53, 27, -176, - -176, -176, 91, 203, -83, -176, -43, -176, -43, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -12, - -55, -44, -176, -2, -176, -176, -92, -176, -176, -176, - 222, -176, -176, -176, -176, -176, -176, -176, -176, 106, - -176, -176, -176, -176, -176, -176, 3, -176, 43, 79, - -176, 106, -176, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, 46, -176, -40, 360, -176, -176, - -176, -95, -176, -176, -43, -176, -176, -176, -176, -176, - -176, -176, -176, 462, -176, 54, -43, -176, -176, -36, - -176, -176, -176, -176, -176, -176, -176, -176, 5, -176, - -176, 90, 92, -176, -176, 37, -176, -65, -176, 111, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -76, -176, 69, 148, -176, -12, -176, -176, - -33, -176, -176, -176, -176, -176, -176, -176, -176, 464, - -176, 70, -12, -176, -176, 75, -53, -176, -176, -176, - 78, -176, -39, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, -1, -125, -176, -176, -176, -176, - -176, 80, -176, -10, -176, -176, -176, -176, 218, -9, - -176, -176, -176, -176, -8, 87, -176, -176, 46, -176, - -12, -33, -176, -176, -176, -176, -176, -176, -176, -176, - 342, -176, -176, 342, 342, -67, 1, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -50, - 120, -176, -176, -176, 305, -176, -176, -176, -176, -176, - -176, -176, -176, -107, -7, -21, -176, -176, -176, -176, - 16, -176, -176, 32, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, 342, - 342, -176, 147, -67, 116, -176, 123, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -52, -176, 34, 6, - 12, -115, -176, 8, -176, -12, -176, -176, -176, -176, - -176, -176, -176, -176, -176, 342, -176, -176, -176, -176, - 18, -176, -176, -176, -43, -176, -176, -176, 29, -176, - -176, -176, 24, 33, -12, 28, -163, -176, 44, -12, - -176, -176, -176, 36, 149, -176, -176, -176, -176, -176, - 132, 47, 35, -176, 51, -176, -12, -176, -176 + 4, -154, -17, -177, -177, -177, -13, -177, 87, 14, + -104, 87, -177, 172, -28, -177, -92, -177, -91, -80, + -177, -76, -177, -177, -28, 452, -28, -177, -177, -73, + -177, -69, -177, -177, -2, 42, 5, 37, -67, -177, + -177, -54, 172, -40, -177, 241, 447, -37, -52, 41, + -177, -177, -177, 31, 175, -61, -177, -28, -177, -28, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + 21, -33, -32, -177, 17, -177, -177, -74, -177, -177, + -177, 209, -177, -177, -177, -177, -177, -177, -177, -177, + 87, -177, -177, -177, -177, -177, -177, 14, -177, 62, + 93, -177, 87, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, 225, -177, -23, 335, -177, + -177, -177, -76, -177, -177, -28, -177, -177, -177, -177, + -177, -177, -177, -177, 452, -177, 76, -28, -177, -177, + -16, -177, -177, -177, -177, -177, -177, -177, -177, 42, + -177, -177, 112, 121, -177, -177, 68, -177, -177, -177, + -67, -177, 94, -30, -177, 172, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, 241, -177, 21, -177, + -177, -29, -177, -177, -177, -177, -177, -177, -177, -177, + 447, -177, 97, 21, -177, -177, 101, -52, -177, -177, + -177, 102, -177, -15, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, 3, -125, -177, -177, -177, + -177, -177, 108, -177, 18, -177, -177, -177, -177, 58, + 23, -177, -177, -177, -177, 26, 120, -177, -177, 225, + -177, 21, -29, -177, -177, -177, -177, -177, -177, -177, + -177, 314, -177, -177, 314, 314, -37, -177, -177, 32, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -44, 148, -177, -177, -177, 390, -177, -177, -177, -177, + -177, -177, -177, -177, -121, 11, 6, -177, -177, -177, + -177, 47, -177, -177, 2, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + 314, 314, -177, 166, -37, 142, -177, 143, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -49, -177, 54, + 19, 36, -129, -177, 35, -177, 21, -177, -177, -177, + -177, -177, -177, -177, -177, -177, 314, -177, -177, -177, + -177, 20, -177, -177, -177, -28, -177, -177, -177, 48, + -177, -177, -177, 34, 50, 21, 51, -153, -177, 53, + 21, -177, -177, -177, 45, -95, -177, -177, -177, -177, + -177, 33, 61, 52, -177, 64, -177, 21, -177, -177 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -176, -176, -176, -37, -176, -176, -14, -35, -176, -176, - -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, -176, -176, 22, -176, -176, -176, - -176, -38, -176, -176, -176, -176, -176, -176, -145, -176, - -176, 133, -176, -176, 97, -176, -176, -176, -3, -176, - -176, -176, -176, 66, -176, -176, 230, -61, -176, -176, - -176, -176, 71, -176, -176, -176, -176, -176, -176, -176, - -176, -176, -176, -176, 127, -176, -176, -176, -176, -176, - -176, 96, -176, -176, 53, -176, -176, 226, 15, -175, - -176, -176, -176, -24, -176, -176, -93, -176, -176, -176, - -126, -176, -138, -176 + -177, -177, -177, -43, -177, -177, -14, -35, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, 56, -177, -177, -177, + -177, -27, -177, -177, -177, -177, -177, -177, -151, -177, + -177, 145, -177, -177, 109, -177, -177, -177, 10, -177, + -177, -177, -177, 90, -177, -177, 243, -55, -177, -177, + -177, -177, 79, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, 137, -177, -177, -177, -177, -177, + -177, 111, -177, -177, 65, -177, -177, 237, 22, -176, + -177, -177, -177, -19, -177, -177, -82, -177, -177, -177, + -116, -177, -128, -177 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1293,128 +1292,124 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 114, 155, 261, 160, 275, 262, 194, 371, 253, 254, - 323, 193, 141, 142, 93, 166, 202, 268, 77, 385, - 206, 111, 154, 112, 1, 78, 263, 349, 224, 390, - 143, 150, 211, 2, 79, 349, 357, 3, 4, 5, - 224, 99, 204, 117, 205, 6, 7, 207, 118, 229, - 119, 212, 8, 9, 281, 282, 10, 120, 358, 11, - 12, 137, 276, 13, 277, 301, 138, 144, 151, 168, - 152, 14, 281, 282, 213, 15, 140, 376, 324, 156, - 243, 16, 157, 17, 161, 113, 199, 230, 231, 232, - 233, 201, 18, 19, 203, 145, 20, 209, 94, 215, - 21, 22, 226, 95, 23, 24, 319, 320, 210, 113, - 245, 227, 242, 247, 81, 372, 248, 251, 82, 252, - 255, 257, 245, 256, 83, 25, 26, 27, 259, 267, - 264, 102, 28, 359, 270, 103, 195, 272, 273, 286, - 360, 29, 287, 297, 298, 30, 299, 31, 153, 32, - 33, 278, 162, 322, 162, 326, 113, 361, 146, 34, - 35, 36, 37, 147, 38, 39, 40, 355, 356, 41, - 354, 42, 279, 84, 366, 369, 365, 163, 43, 163, - 379, 234, 370, 44, 45, 46, 373, 47, 48, 375, - 104, 49, 50, 164, 374, 164, 165, 235, 165, 378, - -6, 51, 236, 237, 362, 85, 86, 363, 380, 388, - 382, 266, 384, 2, 393, 385, 389, 3, 4, 5, - 321, 392, 87, 406, 405, 6, 7, 394, 407, 225, - 246, 408, 8, 9, 105, 300, 10, 166, 258, 11, - 12, 101, 106, 13, 249, 107, 260, 288, 244, 271, - 216, 14, 136, 88, 289, 15, 302, 290, 377, 350, - 391, 16, 404, 17, 0, 108, 0, 167, 0, 167, - 109, 217, 18, 19, 218, 0, 20, 0, 0, 0, - 21, 22, 0, 0, 23, 24, 0, 0, 368, 0, - 0, 168, 0, 291, 0, 169, 170, 169, 170, 0, - 0, 171, 0, 171, 0, 25, 26, 27, 0, 0, - 0, 0, 28, 0, 327, 395, 396, 397, 398, 399, - 0, 29, 328, 292, 403, 30, 0, 31, 0, 32, - 33, 0, 395, 396, 397, 398, 399, 0, 0, 34, - 35, 36, 37, 0, 38, 39, 40, 0, 0, 41, - 0, 42, 0, 0, 219, 220, 329, 330, 43, 0, - 381, 221, 0, 44, 45, 46, 0, 47, 48, 0, - 2, 49, 50, 331, 3, 4, 5, 0, 0, 0, - -6, 51, 6, 7, 293, 0, 0, 303, 0, 8, - 9, 0, 0, 10, 332, 304, 11, 12, 0, 0, - 13, 333, 0, 334, 0, 0, 0, 0, 14, 0, - 0, 0, 15, 305, 306, 0, 307, 335, 16, 0, - 17, 0, 308, 0, 0, 0, 0, 0, 0, 18, - 19, 0, 0, 20, 336, 337, 0, 21, 22, 0, - 0, 23, 24, 0, 0, 0, 0, 0, 309, 310, - 0, 0, 311, 312, 0, 313, 314, 315, 0, 316, - 0, 0, 25, 26, 27, 0, 0, 0, 338, 28, - 339, 0, 0, 0, 0, 340, 0, 178, 29, 341, - 0, 0, 30, 179, 31, 180, 32, 33, 0, 0, - 0, 0, 0, 0, 0, 0, 34, 35, 36, 37, - 0, 38, 39, 40, 0, 0, 41, 0, 42, 0, - 181, 0, 317, 0, 0, 43, 125, 126, 127, 128, - 44, 45, 46, 0, 47, 48, 0, 0, 49, 50, - 0, 0, 0, 0, 0, 0, 0, 0, 51, 0, - 0, 0, 0, 0, 0, 0, 129, 0, 130, 182, - 131, 183, 0, 0, 0, 132, 184, 0, 185, 0, - 0, 186, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 187, 188 + 115, 156, 262, 254, 255, 1, 358, 195, 276, 263, + 372, 203, 194, 350, 2, 166, 324, 269, 3, 4, + 5, 350, 155, 78, 158, 94, 6, 7, 359, 386, + 264, 202, 151, 8, 9, 225, 112, 10, 113, 391, + 11, 12, 79, 205, 13, 206, 80, 225, 100, 142, + 143, 212, 14, 207, 282, 283, 15, 141, 282, 283, + 118, 119, 16, 377, 17, 302, 277, 144, 278, 152, + 213, 153, 120, 18, 19, 244, 121, 20, 159, 138, + 208, 21, 22, 139, 325, 23, 24, 289, 396, 397, + 398, 399, 400, 214, 290, 82, 157, 291, 163, 83, + 200, 320, 321, 360, 145, 84, 25, 26, 27, 95, + 361, 246, 167, 28, 96, 114, 204, 216, 373, 210, + 211, 227, 29, 246, 114, 228, 30, 362, 31, 243, + 32, 33, 146, 292, 265, 248, 249, 196, 260, 252, + 34, 35, 36, 37, 38, 39, 40, 41, 253, 154, + 42, 256, 43, 258, 85, 279, 268, 114, 259, 44, + 271, 273, 274, 293, 45, 46, 47, 287, 48, 49, + 288, 366, 50, 51, 363, 298, 280, 364, 299, 300, + 380, -6, 52, 327, 323, 2, 86, 87, 355, 3, + 4, 5, 103, 367, 356, 147, 104, 6, 7, 357, + 148, 370, 371, 88, 8, 9, 374, 375, 10, 389, + 381, 11, 12, 376, 394, 13, 396, 397, 398, 399, + 400, 322, 385, 14, 294, 404, 379, 15, 230, 383, + 393, 409, 386, 16, 89, 17, 395, 217, 406, 390, + 407, 408, 226, 247, 18, 19, 267, 168, 20, 301, + 257, 105, 21, 22, 102, 261, 23, 24, 218, 245, + 250, 219, 272, 137, 303, 351, 231, 232, 233, 234, + 378, 392, 169, 405, 0, 0, 0, 25, 26, 27, + 0, 0, 0, 0, 28, 0, 0, 0, 170, 369, + 0, 171, 0, 29, 0, 106, 0, 30, 0, 31, + 0, 32, 33, 107, 0, 0, 108, 0, 0, 0, + 0, 34, 35, 36, 37, 38, 39, 40, 41, 0, + 0, 42, 0, 43, 0, 0, 109, 0, 0, 0, + 44, 110, 0, 0, 0, 45, 46, 47, 0, 48, + 49, 220, 221, 50, 51, 2, 0, 0, 222, 3, + 4, 5, -6, 52, 0, 0, 0, 6, 7, 304, + 235, 382, 172, 0, 8, 9, 0, 305, 10, 0, + 0, 11, 12, 0, 0, 13, 236, 0, 0, 0, + 0, 237, 238, 14, 0, 306, 307, 15, 308, 0, + 173, 174, 0, 16, 309, 17, 175, 0, 0, 328, + 0, 0, 0, 0, 18, 19, 0, 329, 20, 0, + 0, 0, 21, 22, 0, 0, 23, 24, 0, 0, + 310, 311, 0, 0, 312, 313, 0, 314, 315, 316, + 0, 317, 0, 0, 0, 0, 0, 25, 26, 27, + 0, 330, 331, 0, 28, 0, 0, 0, 0, 0, + 0, 0, 0, 29, 0, 0, 0, 30, 332, 31, + 179, 32, 33, 0, 0, 0, 180, 0, 181, 0, + 0, 34, 35, 36, 37, 38, 39, 40, 41, 333, + 0, 42, 0, 43, 318, 0, 334, 0, 335, 0, + 44, 0, 0, 182, 0, 45, 46, 47, 0, 48, + 49, 0, 336, 50, 51, 0, 126, 127, 128, 129, + 0, 0, 0, 52, 0, 0, 0, 0, 0, 337, + 338, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 183, 0, 184, 0, 130, 0, 131, 185, + 132, 186, 0, 0, 187, 133, 0, 0, 0, 0, + 0, 0, 0, 339, 0, 340, 0, 0, 0, 0, + 341, 0, 0, 0, 342, 0, 188, 189 }; static const yytype_int16 yycheck[] = { - 14, 36, 177, 41, 5, 38, 59, 59, 153, 154, - 60, 46, 7, 8, 11, 91, 53, 192, 177, 182, - 32, 64, 36, 66, 1, 59, 59, 142, 89, 192, - 25, 27, 34, 10, 59, 142, 4, 14, 15, 16, - 101, 152, 56, 152, 58, 22, 23, 59, 152, 3, - 152, 53, 29, 30, 179, 180, 33, 152, 26, 36, - 37, 152, 63, 40, 65, 240, 152, 62, 64, 145, - 66, 48, 179, 180, 76, 52, 59, 192, 128, 59, - 117, 58, 152, 60, 152, 152, 59, 41, 42, 43, - 44, 0, 69, 70, 177, 90, 73, 152, 95, 191, - 77, 78, 59, 100, 81, 82, 251, 252, 152, 152, - 124, 32, 152, 59, 8, 167, 152, 27, 12, 27, - 83, 159, 136, 188, 18, 102, 103, 104, 59, 59, - 163, 20, 109, 101, 59, 24, 189, 59, 177, 59, - 108, 118, 152, 152, 152, 122, 59, 124, 144, 126, - 127, 152, 6, 152, 6, 35, 152, 125, 153, 136, - 137, 138, 139, 158, 141, 142, 143, 188, 152, 146, - 177, 148, 173, 67, 27, 59, 321, 31, 155, 31, - 355, 135, 59, 160, 161, 162, 152, 164, 165, 177, - 79, 168, 169, 47, 188, 47, 50, 151, 50, 191, - 177, 178, 156, 157, 172, 99, 100, 175, 190, 384, - 181, 189, 188, 10, 389, 182, 188, 14, 15, 16, - 255, 177, 116, 188, 177, 22, 23, 191, 177, 96, - 133, 406, 29, 30, 123, 238, 33, 91, 172, 36, - 37, 11, 131, 40, 148, 134, 175, 29, 121, 196, - 28, 48, 26, 147, 36, 52, 241, 39, 351, 283, - 386, 58, 400, 60, -1, 154, -1, 121, -1, 121, - 159, 49, 69, 70, 52, -1, 73, -1, -1, -1, - 77, 78, -1, -1, 81, 82, -1, -1, 323, -1, - -1, 145, -1, 75, -1, 149, 150, 149, 150, -1, - -1, 155, -1, 155, -1, 102, 103, 104, -1, -1, - -1, -1, 109, -1, 9, 183, 184, 185, 186, 187, - -1, 118, 17, 105, 192, 122, -1, 124, -1, 126, - 127, -1, 183, 184, 185, 186, 187, -1, -1, 136, - 137, 138, 139, -1, 141, 142, 143, -1, -1, 146, - -1, 148, -1, -1, 132, 133, 51, 52, 155, -1, - 374, 139, -1, 160, 161, 162, -1, 164, 165, -1, - 10, 168, 169, 68, 14, 15, 16, -1, -1, -1, - 177, 178, 22, 23, 166, -1, -1, 45, -1, 29, - 30, -1, -1, 33, 89, 53, 36, 37, -1, -1, - 40, 96, -1, 98, -1, -1, -1, -1, 48, -1, - -1, -1, 52, 71, 72, -1, 74, 112, 58, -1, - 60, -1, 80, -1, -1, -1, -1, -1, -1, 69, - 70, -1, -1, 73, 129, 130, -1, 77, 78, -1, - -1, 81, 82, -1, -1, -1, -1, -1, 106, 107, - -1, -1, 110, 111, -1, 113, 114, 115, -1, 117, - -1, -1, 102, 103, 104, -1, -1, -1, 163, 109, - 165, -1, -1, -1, -1, 170, -1, 13, 118, 174, - -1, -1, 122, 19, 124, 21, 126, 127, -1, -1, - -1, -1, -1, -1, -1, -1, 136, 137, 138, 139, - -1, 141, 142, 143, -1, -1, 146, -1, 148, -1, - 46, -1, 170, -1, -1, 155, 54, 55, 56, 57, - 160, 161, 162, -1, 164, 165, -1, -1, 168, 169, - -1, -1, -1, -1, -1, -1, -1, -1, 178, -1, - -1, -1, -1, -1, -1, -1, 84, -1, 86, 85, - 88, 87, -1, -1, -1, 93, 92, -1, 94, -1, - -1, 97, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 119, 120 + 14, 36, 178, 154, 155, 1, 4, 59, 5, 38, + 59, 54, 47, 142, 10, 42, 60, 193, 14, 15, + 16, 142, 36, 177, 91, 11, 22, 23, 26, 182, + 59, 0, 27, 29, 30, 90, 64, 33, 66, 192, + 36, 37, 59, 57, 40, 59, 59, 102, 152, 7, + 8, 34, 48, 32, 179, 180, 52, 59, 179, 180, + 152, 152, 58, 192, 60, 241, 63, 25, 65, 64, + 53, 66, 152, 69, 70, 118, 152, 73, 145, 152, + 59, 77, 78, 152, 128, 81, 82, 29, 183, 184, + 185, 186, 187, 76, 36, 8, 59, 39, 152, 12, + 59, 252, 253, 101, 62, 18, 102, 103, 104, 95, + 108, 125, 152, 109, 100, 152, 177, 191, 167, 152, + 152, 59, 118, 137, 152, 32, 122, 125, 124, 152, + 126, 127, 90, 75, 163, 59, 152, 189, 165, 27, + 136, 137, 138, 139, 140, 141, 142, 143, 27, 144, + 146, 83, 148, 59, 67, 152, 59, 152, 188, 155, + 59, 59, 177, 105, 160, 161, 162, 59, 164, 165, + 152, 322, 168, 169, 172, 152, 173, 175, 152, 59, + 356, 177, 178, 35, 152, 10, 99, 100, 177, 14, + 15, 16, 20, 27, 188, 153, 24, 22, 23, 152, + 158, 59, 59, 116, 29, 30, 152, 188, 33, 385, + 190, 36, 37, 177, 390, 40, 183, 184, 185, 186, + 187, 256, 188, 48, 166, 192, 191, 52, 3, 181, + 177, 407, 182, 58, 147, 60, 191, 28, 177, 188, + 188, 177, 97, 134, 69, 70, 190, 6, 73, 239, + 160, 79, 77, 78, 11, 176, 81, 82, 49, 122, + 149, 52, 197, 26, 242, 284, 41, 42, 43, 44, + 352, 387, 31, 401, -1, -1, -1, 102, 103, 104, + -1, -1, -1, -1, 109, -1, -1, -1, 47, 324, + -1, 50, -1, 118, -1, 123, -1, 122, -1, 124, + -1, 126, 127, 131, -1, -1, 134, -1, -1, -1, + -1, 136, 137, 138, 139, 140, 141, 142, 143, -1, + -1, 146, -1, 148, -1, -1, 154, -1, -1, -1, + 155, 159, -1, -1, -1, 160, 161, 162, -1, 164, + 165, 132, 133, 168, 169, 10, -1, -1, 139, 14, + 15, 16, 177, 178, -1, -1, -1, 22, 23, 45, + 135, 375, 121, -1, 29, 30, -1, 53, 33, -1, + -1, 36, 37, -1, -1, 40, 151, -1, -1, -1, + -1, 156, 157, 48, -1, 71, 72, 52, 74, -1, + 149, 150, -1, 58, 80, 60, 155, -1, -1, 9, + -1, -1, -1, -1, 69, 70, -1, 17, 73, -1, + -1, -1, 77, 78, -1, -1, 81, 82, -1, -1, + 106, 107, -1, -1, 110, 111, -1, 113, 114, 115, + -1, 117, -1, -1, -1, -1, -1, 102, 103, 104, + -1, 51, 52, -1, 109, -1, -1, -1, -1, -1, + -1, -1, -1, 118, -1, -1, -1, 122, 68, 124, + 13, 126, 127, -1, -1, -1, 19, -1, 21, -1, + -1, 136, 137, 138, 139, 140, 141, 142, 143, 89, + -1, 146, -1, 148, 170, -1, 96, -1, 98, -1, + 155, -1, -1, 46, -1, 160, 161, 162, -1, 164, + 165, -1, 112, 168, 169, -1, 54, 55, 56, 57, + -1, -1, -1, 178, -1, -1, -1, -1, -1, 129, + 130, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 85, -1, 87, -1, 84, -1, 86, 92, + 88, 94, -1, -1, 97, 93, -1, -1, -1, -1, + -1, -1, -1, 163, -1, 165, -1, -1, -1, -1, + 170, -1, -1, -1, 174, -1, 119, 120 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1424,44 +1419,44 @@ static const yytype_uint16 yystos[] = 0, 1, 10, 14, 15, 16, 22, 23, 29, 30, 33, 36, 37, 40, 48, 52, 58, 60, 69, 70, 73, 77, 78, 81, 82, 102, 103, 104, 109, 118, - 122, 124, 126, 127, 136, 137, 138, 139, 141, 142, - 143, 146, 148, 155, 160, 161, 162, 164, 165, 168, - 169, 178, 194, 195, 196, 197, 198, 210, 211, 212, - 213, 217, 222, 230, 239, 244, 248, 253, 257, 258, - 259, 260, 268, 269, 272, 283, 284, 177, 59, 59, - 214, 8, 12, 18, 67, 99, 100, 116, 147, 249, - 250, 251, 252, 11, 95, 100, 233, 234, 235, 152, - 261, 249, 20, 24, 79, 123, 131, 134, 154, 159, - 224, 64, 66, 152, 199, 200, 201, 152, 152, 152, - 152, 266, 267, 199, 280, 54, 55, 56, 57, 84, - 86, 88, 93, 236, 237, 238, 280, 152, 152, 279, - 59, 7, 8, 25, 62, 90, 153, 158, 273, 274, - 27, 64, 66, 144, 199, 200, 59, 152, 262, 223, - 224, 152, 6, 31, 47, 50, 91, 121, 145, 149, - 150, 155, 245, 246, 247, 254, 255, 256, 13, 19, - 21, 46, 85, 87, 92, 94, 97, 119, 120, 218, - 219, 220, 221, 200, 59, 189, 276, 277, 278, 59, - 275, 0, 196, 177, 199, 199, 32, 59, 282, 152, - 152, 34, 53, 76, 271, 191, 28, 49, 52, 132, - 133, 139, 215, 216, 250, 234, 59, 32, 225, 3, - 41, 42, 43, 44, 135, 151, 156, 157, 240, 241, - 242, 243, 152, 196, 267, 199, 237, 59, 152, 274, - 231, 27, 27, 231, 231, 83, 188, 224, 246, 59, - 255, 282, 38, 59, 163, 281, 219, 59, 282, 264, - 59, 277, 59, 177, 202, 5, 63, 65, 152, 173, - 270, 179, 180, 285, 286, 287, 59, 152, 29, 36, - 39, 75, 105, 166, 226, 227, 228, 152, 152, 59, - 241, 282, 281, 45, 53, 71, 72, 74, 80, 106, - 107, 110, 111, 113, 114, 115, 117, 170, 232, 231, - 231, 200, 152, 60, 128, 265, 35, 9, 17, 51, - 52, 68, 89, 96, 98, 112, 129, 130, 163, 165, - 170, 174, 203, 204, 205, 206, 207, 208, 209, 142, - 286, 288, 289, 291, 177, 188, 152, 4, 26, 101, - 108, 125, 172, 175, 229, 231, 27, 263, 200, 59, - 59, 59, 167, 152, 188, 177, 192, 289, 191, 282, - 190, 199, 181, 290, 188, 182, 292, 293, 282, 188, - 192, 293, 177, 282, 191, 183, 184, 185, 186, 187, - 294, 295, 296, 192, 295, 177, 188, 177, 282 + 122, 124, 126, 127, 136, 137, 138, 139, 140, 141, + 142, 143, 146, 148, 155, 160, 161, 162, 164, 165, + 168, 169, 178, 194, 195, 196, 197, 198, 210, 211, + 212, 213, 217, 222, 230, 239, 244, 248, 253, 257, + 258, 259, 260, 268, 269, 272, 283, 284, 177, 59, + 59, 214, 8, 12, 18, 67, 99, 100, 116, 147, + 249, 250, 251, 252, 11, 95, 100, 233, 234, 235, + 152, 261, 249, 20, 24, 79, 123, 131, 134, 154, + 159, 224, 64, 66, 152, 199, 200, 201, 152, 152, + 152, 152, 266, 267, 199, 280, 54, 55, 56, 57, + 84, 86, 88, 93, 236, 237, 238, 280, 152, 152, + 279, 59, 7, 8, 25, 62, 90, 153, 158, 273, + 274, 27, 64, 66, 144, 199, 200, 59, 91, 145, + 245, 246, 247, 152, 262, 223, 224, 152, 6, 31, + 47, 50, 121, 149, 150, 155, 254, 255, 256, 13, + 19, 21, 46, 85, 87, 92, 94, 97, 119, 120, + 218, 219, 220, 221, 200, 59, 189, 276, 277, 278, + 59, 275, 0, 196, 177, 199, 199, 32, 59, 282, + 152, 152, 34, 53, 76, 271, 191, 28, 49, 52, + 132, 133, 139, 215, 216, 250, 234, 59, 32, 225, + 3, 41, 42, 43, 44, 135, 151, 156, 157, 240, + 241, 242, 243, 152, 196, 267, 199, 237, 59, 152, + 274, 231, 27, 27, 231, 231, 83, 246, 59, 188, + 224, 255, 282, 38, 59, 163, 281, 219, 59, 282, + 264, 59, 277, 59, 177, 202, 5, 63, 65, 152, + 173, 270, 179, 180, 285, 286, 287, 59, 152, 29, + 36, 39, 75, 105, 166, 226, 227, 228, 152, 152, + 59, 241, 282, 281, 45, 53, 71, 72, 74, 80, + 106, 107, 110, 111, 113, 114, 115, 117, 170, 232, + 231, 231, 200, 152, 60, 128, 265, 35, 9, 17, + 51, 52, 68, 89, 96, 98, 112, 129, 130, 163, + 165, 170, 174, 203, 204, 205, 206, 207, 208, 209, + 142, 286, 288, 289, 291, 177, 188, 152, 4, 26, + 101, 108, 125, 172, 175, 229, 231, 27, 263, 200, + 59, 59, 59, 167, 152, 188, 177, 192, 289, 191, + 282, 190, 199, 181, 290, 188, 182, 292, 293, 282, + 188, 192, 293, 177, 282, 191, 183, 184, 185, 186, + 187, 294, 295, 296, 192, 295, 177, 188, 177, 282 }; #define yyerrok (yyerrstatus = 0) @@ -1476,9 +1471,18 @@ static const yytype_uint16 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1535,7 +1539,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -2274,7 +2278,7 @@ yyreduce: { case 5: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 364 "ntp_parser.y" { /* I will need to incorporate much more fine grained @@ -2291,7 +2295,7 @@ yyreduce: case 20: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 399 "ntp_parser.y" { peer_node *my_node; @@ -2303,42 +2307,42 @@ yyreduce: case 27: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 418 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), (yyvsp[(1) - (2)].Integer)); } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 423 "ntp_parser.y" { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_UNSPEC); } break; case 29: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 428 "ntp_parser.y" { (yyval.Integer) = AF_INET; } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 430 "ntp_parser.y" { (yyval.Integer) = AF_INET6; } break; case 31: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 435 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 437 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2348,35 +2352,35 @@ yyreduce: case 36: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 451 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 467 "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 1464 of yacc.c */ #line 469 "ntp_parser.y" { (yyval.Attr_val) = create_attr_uval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 53: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 483 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 497 "ntp_parser.y" { unpeer_node *my_node; @@ -2389,28 +2393,28 @@ yyreduce: case 58: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 518 "ntp_parser.y" { cfgt.broadcastclient = 1; } break; case 59: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 520 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[(2) - (2)].Address_fifo)); } break; case 60: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 522 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[(2) - (2)].Address_fifo)); } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 533 "ntp_parser.y" { attr_val *atrv; @@ -2422,14 +2426,14 @@ yyreduce: case 62: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 540 "ntp_parser.y" { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 542 "ntp_parser.y" { cfgt.auth.cryptosw++; @@ -2439,35 +2443,35 @@ yyreduce: case 64: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 547 "ntp_parser.y" { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } break; case 65: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 549 "ntp_parser.y" { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } break; case 66: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 551 "ntp_parser.y" { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 553 "ntp_parser.y" { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 555 "ntp_parser.y" { cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Attr_val_fifo); @@ -2481,21 +2485,21 @@ yyreduce: case 69: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 564 "ntp_parser.y" { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 569 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } break; case 71: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 571 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2505,14 +2509,14 @@ yyreduce: case 72: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 579 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 73: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 581 "ntp_parser.y" { (yyval.Attr_val) = NULL; @@ -2526,14 +2530,14 @@ yyreduce: case 79: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 606 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 80: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 611 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2543,7 +2547,7 @@ yyreduce: case 81: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 616 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -2553,35 +2557,35 @@ yyreduce: case 82: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 624 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 83: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 626 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 84: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 628 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } break; case 95: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 654 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[(2) - (2)].Int_fifo)); } break; case 96: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 656 "ntp_parser.y" { if (input_from_file) { @@ -2595,7 +2599,7 @@ yyreduce: case 97: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 665 "ntp_parser.y" { filegen_node *fgn; @@ -2607,7 +2611,7 @@ yyreduce: case 98: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 675 "ntp_parser.y" { (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); @@ -2617,7 +2621,7 @@ yyreduce: case 99: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 680 "ntp_parser.y" { (yyval.Int_fifo) = NULL; @@ -2627,14 +2631,14 @@ yyreduce: case 108: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 699 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } break; case 109: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 701 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2644,7 +2648,7 @@ yyreduce: case 110: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 709 "ntp_parser.y" { if (input_from_file) { @@ -2659,7 +2663,7 @@ yyreduce: case 111: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 719 "ntp_parser.y" { if (input_from_file) { @@ -2673,7 +2677,7 @@ yyreduce: case 112: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 728 "ntp_parser.y" { const char *err; @@ -2693,14 +2697,14 @@ yyreduce: case 113: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 743 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 125: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 773 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); @@ -2709,7 +2713,7 @@ yyreduce: case 126: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 777 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); @@ -2718,7 +2722,7 @@ yyreduce: case 127: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 781 "ntp_parser.y" { restrict_node *rn; @@ -2731,7 +2735,7 @@ yyreduce: case 128: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 789 "ntp_parser.y" { restrict_node *rn; @@ -2744,7 +2748,7 @@ yyreduce: case 129: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 797 "ntp_parser.y" { restrict_node *rn; @@ -2757,7 +2761,7 @@ yyreduce: case 130: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 805 "ntp_parser.y" { restrict_node *rn; @@ -2777,7 +2781,7 @@ yyreduce: case 131: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 820 "ntp_parser.y" { restrict_node *rn; @@ -2797,7 +2801,7 @@ yyreduce: case 132: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 835 "ntp_parser.y" { restrict_node * rn; @@ -2811,14 +2815,14 @@ yyreduce: case 133: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 847 "ntp_parser.y" { (yyval.Int_fifo) = NULL; } break; case 134: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 849 "ntp_parser.y" { (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); @@ -2828,7 +2832,7 @@ yyreduce: case 150: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 875 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2838,7 +2842,7 @@ yyreduce: case 151: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 880 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -2848,14 +2852,14 @@ yyreduce: case 152: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 888 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 156: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 899 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2865,7 +2869,7 @@ yyreduce: case 157: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 904 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -2875,14 +2879,14 @@ yyreduce: case 158: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 912 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 167: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 932 "ntp_parser.y" { addr_opts_node *aon; @@ -2894,7 +2898,7 @@ yyreduce: case 168: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 942 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2904,7 +2908,7 @@ yyreduce: case 169: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 947 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -2914,49 +2918,49 @@ yyreduce: case 170: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 955 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 171: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 957 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 172: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 959 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 173: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 961 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 174: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 963 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } break; case 181: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 984 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 182: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 989 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -2966,7 +2970,7 @@ yyreduce: case 183: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 994 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -2976,28 +2980,28 @@ yyreduce: case 184: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1002 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 187: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1017 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 188: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1019 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 189: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1024 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3007,7 +3011,7 @@ yyreduce: case 190: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1029 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3017,14 +3021,14 @@ yyreduce: case 191: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1037 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } break; case 192: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1039 "ntp_parser.y" { if (input_from_file) { @@ -3043,14 +3047,14 @@ yyreduce: case 201: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1074 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 202: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1079 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3060,7 +3064,7 @@ yyreduce: case 203: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1084 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3070,14 +3074,14 @@ yyreduce: case 204: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1092 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } break; case 215: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1115 "ntp_parser.y" { attr_val *av; @@ -3089,7 +3093,7 @@ yyreduce: case 216: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1122 "ntp_parser.y" { attr_val *av; @@ -3101,7 +3105,7 @@ yyreduce: case 217: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1129 "ntp_parser.y" { char error_text[64]; @@ -3122,7 +3126,7 @@ yyreduce: case 218: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1145 "ntp_parser.y" { if (!input_from_file) { @@ -3146,7 +3150,7 @@ yyreduce: case 219: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1164 "ntp_parser.y" { while (curr_include_level != -1) @@ -3156,35 +3160,35 @@ yyreduce: case 220: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1169 "ntp_parser.y" { /* see drift_parm below for actions */ } break; case 221: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1171 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 222: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1173 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[(2) - (2)].String_fifo)); } break; case 223: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1175 "ntp_parser.y" { APPEND_G_FIFO(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } break; case 224: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1177 "ntp_parser.y" { addr_opts_node *aon; @@ -3196,14 +3200,14 @@ yyreduce: case 225: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1184 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[(2) - (2)].Attr_val_fifo)); } break; case 234: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1206 "ntp_parser.y" { attr_val *av; @@ -3215,7 +3219,7 @@ yyreduce: case 235: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1213 "ntp_parser.y" { attr_val *av; @@ -3229,7 +3233,7 @@ yyreduce: case 236: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1222 "ntp_parser.y" { attr_val *av; @@ -3241,28 +3245,28 @@ yyreduce: case 237: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1232 "ntp_parser.y" { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } break; case 239: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1238 "ntp_parser.y" { (yyval.Integer) = 0; } break; case 240: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1243 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; } break; case 241: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1245 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3272,14 +3276,14 @@ yyreduce: case 242: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1253 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } break; case 243: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1255 "ntp_parser.y" { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), estrdup((yyvsp[(2) - (2)].Address_node)->address)); @@ -3289,7 +3293,7 @@ yyreduce: case 244: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1263 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3299,7 +3303,7 @@ yyreduce: case 245: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1268 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3309,7 +3313,7 @@ yyreduce: case 246: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1276 "ntp_parser.y" { char prefix; @@ -3336,7 +3340,7 @@ yyreduce: case 247: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1301 "ntp_parser.y" { nic_rule_node *nrn; @@ -3348,7 +3352,7 @@ yyreduce: case 248: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1308 "ntp_parser.y" { nic_rule_node *nrn; @@ -3360,14 +3364,14 @@ yyreduce: case 258: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1336 "ntp_parser.y" { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[(2) - (2)].Int_fifo)); } break; case 259: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1341 "ntp_parser.y" { (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); @@ -3377,7 +3381,7 @@ yyreduce: case 260: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1346 "ntp_parser.y" { (yyval.Int_fifo) = NULL; @@ -3387,7 +3391,7 @@ yyreduce: case 268: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1370 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3397,7 +3401,7 @@ yyreduce: case 269: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1375 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3407,7 +3411,7 @@ yyreduce: case 270: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1383 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); @@ -3417,7 +3421,7 @@ yyreduce: case 271: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1388 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3427,21 +3431,21 @@ yyreduce: case 272: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1396 "ntp_parser.y" { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[(1) - (1)].Integer)); } break; case 274: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1402 "ntp_parser.y" { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[(2) - (5)].Integer), (yyvsp[(4) - (5)].Integer)); } break; case 275: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1407 "ntp_parser.y" { (yyval.String_fifo) = (yyvsp[(1) - (2)].String_fifo); @@ -3451,7 +3455,7 @@ yyreduce: case 276: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1412 "ntp_parser.y" { (yyval.String_fifo) = NULL; @@ -3461,7 +3465,7 @@ yyreduce: case 277: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1420 "ntp_parser.y" { (yyval.Address_fifo) = (yyvsp[(1) - (2)].Address_fifo); @@ -3471,7 +3475,7 @@ yyreduce: case 278: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1425 "ntp_parser.y" { (yyval.Address_fifo) = NULL; @@ -3481,7 +3485,7 @@ yyreduce: case 279: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1433 "ntp_parser.y" { if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) { @@ -3495,28 +3499,28 @@ yyreduce: case 280: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1441 "ntp_parser.y" { (yyval.Integer) = 1; } break; case 281: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1442 "ntp_parser.y" { (yyval.Integer) = 0; } break; case 282: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1446 "ntp_parser.y" { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } break; case 284: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1457 "ntp_parser.y" { sim_node *sn; @@ -3531,14 +3535,14 @@ yyreduce: case 285: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1474 "ntp_parser.y" { old_config_style = 0; } break; case 286: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1479 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); @@ -3548,7 +3552,7 @@ yyreduce: case 287: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1484 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3558,14 +3562,14 @@ yyreduce: case 288: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1492 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; case 291: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1502 "ntp_parser.y" { (yyval.Sim_server_fifo) = (yyvsp[(1) - (2)].Sim_server_fifo); @@ -3575,7 +3579,7 @@ yyreduce: case 292: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1507 "ntp_parser.y" { (yyval.Sim_server_fifo) = NULL; @@ -3585,28 +3589,28 @@ yyreduce: case 293: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1515 "ntp_parser.y" { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Sim_script_fifo)); } break; case 294: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1520 "ntp_parser.y" { (yyval.Double) = (yyvsp[(3) - (4)].Double); } break; case 295: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1525 "ntp_parser.y" { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } break; case 296: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1530 "ntp_parser.y" { (yyval.Sim_script_fifo) = (yyvsp[(1) - (2)].Sim_script_fifo); @@ -3616,7 +3620,7 @@ yyreduce: case 297: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1535 "ntp_parser.y" { (yyval.Sim_script_fifo) = NULL; @@ -3626,14 +3630,14 @@ yyreduce: case 298: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1543 "ntp_parser.y" { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Attr_val_fifo)); } break; case 299: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1548 "ntp_parser.y" { (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); @@ -3643,7 +3647,7 @@ yyreduce: case 300: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1553 "ntp_parser.y" { (yyval.Attr_val_fifo) = NULL; @@ -3653,15 +3657,15 @@ yyreduce: case 301: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1561 "ntp_parser.y" { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } break; -/* Line 1455 of yacc.c */ -#line 3665 "../../ntpd/ntp_parser.c" +/* Line 1464 of yacc.c */ +#line 3669 "ntp_parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3872,7 +3876,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 1684 of yacc.c */ #line 1572 "ntp_parser.y" diff --git a/ntpd/ntp_parser.h b/ntpd/ntp_parser.h index 2ad990165..2b5c83258 100644 --- a/ntpd/ntp_parser.h +++ b/ntpd/ntp_parser.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -420,7 +419,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 1685 of yacc.c */ #line 49 "ntp_parser.y" char * String; @@ -442,8 +441,8 @@ typedef union YYSTYPE -/* Line 1676 of yacc.c */ -#line 447 "../../ntpd/ntp_parser.h" +/* Line 1685 of yacc.c */ +#line 446 "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 ebd6dc4a0..99ea9e99c 100644 --- a/ntpd/ntp_parser.y +++ b/ntpd/ntp_parser.y @@ -980,7 +980,7 @@ fudge_factor_bool_keyword */ rlimit_command - : T_Tinker rlimit_option_list + : T_Rlimit rlimit_option_list { CONCAT_G_FIFOS(cfgt.rlimit, $2); } ;