diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/ntpd | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/ntpd')
48 files changed, 2045 insertions, 1940 deletions
diff --git a/contrib/ntp/ntpd/Makefile.am b/contrib/ntp/ntpd/Makefile.am index c94f7c0..a5690b7 100644 --- a/contrib/ntp/ntpd/Makefile.am +++ b/contrib/ntp/ntpd/Makefile.am @@ -432,6 +432,9 @@ version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/ version.o: version.c env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o +$(srcdir)/Makefile.am: + @: do-nothing + include $(top_srcdir)/bincheck.mf include $(top_srcdir)/check-libopts.mf include $(top_srcdir)/sntp/check-libntp.mf diff --git a/contrib/ntp/ntpd/Makefile.in b/contrib/ntp/ntpd/Makefile.in index 7f30846..2304e33 100644 --- a/contrib/ntp/ntpd/Makefile.in +++ b/contrib/ntp/ntpd/Makefile.in @@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ntp_locinfo.m4 \ $(top_srcdir)/sntp/m4/ntp_openssl.m4 \ $(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \ + $(top_srcdir)/sntp/m4/ntp_problemtests.m4 \ $(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \ $(top_srcdir)/sntp/m4/ntp_rlimit.m4 \ $(top_srcdir)/sntp/m4/ntp_sntp.m4 \ @@ -343,6 +344,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_THREAD = @BUILD_THREAD@ CALC_TICKADJ_DB = @CALC_TICKADJ_DB@ CALC_TICKADJ_DL = @CALC_TICKADJ_DL@ CALC_TICKADJ_DS = @CALC_TICKADJ_DS@ @@ -351,6 +353,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@ CFLAGS_NTP = @CFLAGS_NTP@ CHUTEST = @CHUTEST@ CONFIG_SHELL = @CONFIG_SHELL@ @@ -412,6 +415,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIPO = @LIPO@ LN_S = @LN_S@ LSCF = @LSCF@ +LTHREAD_LIBS = @LTHREAD_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKE_ADJTIMED = @MAKE_ADJTIMED@ @@ -1827,6 +1831,9 @@ version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/ version.o: version.c env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o +$(srcdir)/Makefile.am: + @: do-nothing + install-exec-hook: @test -z "${bin_PROGRAMS}${bin_SCRIPTS}" \ || for i in ${bin_PROGRAMS} ${bin_SCRIPTS} " "; do \ diff --git a/contrib/ntp/ntpd/invoke-ntp.conf.texi b/contrib/ntp/ntpd/invoke-ntp.conf.texi index d7a9d13..37427d6 100644 --- a/contrib/ntp/ntpd/invoke-ntp.conf.texi +++ b/contrib/ntp/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed June 29, 2015 at 04:30:28 PM by AutoGen 5.18.5 +# It has been AutoGen-ed October 21, 2015 at 12:38:16 PM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -1837,7 +1837,7 @@ re-associate accordingly. Some administrators prefer to avoid running @code{ntpd(1ntpdmdoc)} continuously and run either -@code{ntpdate(8)} +@code{sntp(1sntpmdoc)} or @code{ntpd(1ntpdmdoc)} @code{-q} @@ -1921,7 +1921,7 @@ peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. @item @code{minclock} @kbd{minclock} -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than @code{minclock} associations remain. @@ -2578,12 +2578,15 @@ pulses will not be suppressed. @item @code{rlimit} @code{[@code{memlock} @kbd{Nmegabytes} | @code{stacksize} @kbd{N4kPages} @code{filenum} @kbd{Nfiledescriptors}]} @table @asis @item @code{memlock} @kbd{Nmegabytes} -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the @code{-i} option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and -1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". @item @code{stacksize} @kbd{N4kPages} Specifies the maximum size of the process stack on systems with the @code{mlockall()} diff --git a/contrib/ntp/ntpd/invoke-ntp.keys.texi b/contrib/ntp/ntpd/invoke-ntp.keys.texi index 622c4ff..33fdb89 100644 --- a/contrib/ntp/ntpd/invoke-ntp.keys.texi +++ b/contrib/ntp/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed June 29, 2015 at 04:30:31 PM by AutoGen 5.18.5 +# It has been AutoGen-ed October 21, 2015 at 12:38:19 PM by AutoGen 5.18.5 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/contrib/ntp/ntpd/invoke-ntpd.texi b/contrib/ntp/ntpd/invoke-ntpd.texi index 6936dda..a781b26 100644 --- a/contrib/ntp/ntpd/invoke-ntpd.texi +++ b/contrib/ntp/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed June 29, 2015 at 04:30:33 PM by AutoGen 5.18.5 +# It has been AutoGen-ed October 21, 2015 at 12:38:21 PM by AutoGen 5.18.5 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -142,7 +142,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.8p3 +ntpd - NTP daemon program - Ver. 4.2.8p4 Usage: ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \ [ <server1> ... <serverN> ] Flg Arg Option-Name Description diff --git a/contrib/ntp/ntpd/ntp.conf.5man b/contrib/ntp/ntpd/ntp.conf.5man index 14438bd..ee457df4 100644 --- a/contrib/ntp/ntpd/ntp.conf.5man +++ b/contrib/ntp/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "29 Jun 2015" "4.2.8p3" "File Formats" +.TH ntp.conf 5man "21 Oct 2015" "4.2.8p4" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-9oaqYI/ag-OpaiXI) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:01 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2080,7 +2080,7 @@ re-associate accordingly. Some administrators prefer to avoid running \fCntpd\f[]\fR(1ntpdmdoc)\f[] continuously and run either -\fCntpdate\f[]\fR(8)\f[] +\fCsntp\f[]\fR(1sntpmdoc)\f[] or \fCntpd\f[]\fR(1ntpdmdoc)\f[] \f\*[B-Font]\-q\f[] @@ -2170,7 +2170,7 @@ This value defaults to 1, but can be changed to any number from 1 to 15. .TP 7 .NOP \f\*[B-Font]minclock\f[] \f\*[I-Font]minclock\f[] -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than \f\*[B-Font]minclock\f[] associations remain. @@ -2897,12 +2897,15 @@ pulses will not be suppressed. .RS .TP 7 .NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[] -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the \f\*[B-Font]\-i\f[] option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the diff --git a/contrib/ntp/ntpd/ntp.conf.5mdoc b/contrib/ntp/ntpd/ntp.conf.5mdoc index 938acf6..a883aab 100644 --- a/contrib/ntp/ntpd/ntp.conf.5mdoc +++ b/contrib/ntp/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:24 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1903,7 +1903,7 @@ re\-associate accordingly. Some administrators prefer to avoid running .Xr ntpd 1ntpdmdoc continuously and run either -.Xr ntpdate 8 +.Xr sntp 1sntpmdoc or .Xr ntpd 1ntpdmdoc .Fl q @@ -1995,7 +1995,7 @@ peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. .It Cm minclock Ar minclock -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than .Cm minclock associations remain. @@ -2725,12 +2725,15 @@ pulses will not be suppressed. .Xc .Bl -tag -width indent .It Cm memlock Ar Nmegabytes -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the .Fl i option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non\-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the .Fn mlockall diff --git a/contrib/ntp/ntpd/ntp.conf.def b/contrib/ntp/ntpd/ntp.conf.def index 7e09c03..43835bc 100644 --- a/contrib/ntp/ntpd/ntp.conf.def +++ b/contrib/ntp/ntpd/ntp.conf.def @@ -1905,7 +1905,7 @@ re-associate accordingly. Some administrators prefer to avoid running .Xr ntpd 1ntpdmdoc continuously and run either -.Xr ntpdate 8 +.Xr sntp 1sntpmdoc or .Xr ntpd 1ntpdmdoc .Fl q @@ -1997,7 +1997,7 @@ peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. .It Cm minclock Ar minclock -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than .Cm minclock associations remain. @@ -2727,12 +2727,15 @@ pulses will not be suppressed. .Xc .Bl -tag -width indent .It Cm memlock Ar Nmegabytes -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the .Fl i option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and -1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the .Fn mlockall diff --git a/contrib/ntp/ntpd/ntp.conf.html b/contrib/ntp/ntpd/ntp.conf.html index ad64355..1f0c819 100644 --- a/contrib/ntp/ntpd/ntp.conf.html +++ b/contrib/ntp/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: <a rel="up" accesskey="u" href="#dir">(dir)</a> <p>This document describes the configuration file for the NTP Project's <code>ntpd</code> program. - <p>This document applies to version 4.2.8p3 of <code>ntp.conf</code>. + <p>This document applies to version 4.2.8p4 of <code>ntp.conf</code>. <div class="shortcontents"> <h2>Short Contents</h2> @@ -1839,7 +1839,7 @@ re-associate accordingly. <p>Some administrators prefer to avoid running <code>ntpd(1ntpdmdoc)</code> continuously and run either -<code>ntpdate(8)</code> +<code>sntp(1sntpmdoc)</code> or <code>ntpd(1ntpdmdoc)</code> <code>-q</code> @@ -1922,7 +1922,7 @@ will be discarded if there are at least peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. -<br><dt><code>minclock</code> <kbd>minclock</kbd><dd>The clustering algorithm repeatedly casts out outlyer +<br><dt><code>minclock</code> <kbd>minclock</kbd><dd>The clustering algorithm repeatedly casts out outlier associations until no more than <code>minclock</code> associations remain. @@ -2546,12 +2546,15 @@ pulses will not be suppressed. </dl> <br><dt><code>rlimit</code> <code>[memlock </code><kbd>Nmegabytes</kbd><code> | stacksize </code><kbd>N4kPages</kbd><code> filenum </code><kbd>Nfiledescriptors</kbd><code>]</code><dd> <dl> -<dt><code>memlock</code> <kbd>Nmegabytes</kbd><dd>Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +<dt><code>memlock</code> <kbd>Nmegabytes</kbd><dd>Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the <code>-i</code> option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and -1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". <br><dt><code>stacksize</code> <kbd>N4kPages</kbd><dd>Specifies the maximum size of the process stack on systems with the <code>mlockall()</code> function. diff --git a/contrib/ntp/ntpd/ntp.conf.man.in b/contrib/ntp/ntpd/ntp.conf.man.in index ef9e14d..7c8a39f 100644 --- a/contrib/ntp/ntpd/ntp.conf.man.in +++ b/contrib/ntp/ntpd/ntp.conf.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5 "29 Jun 2015" "4.2.8p3" "File Formats" +.TH ntp.conf 5 "21 Oct 2015" "4.2.8p4" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-R0aO7B/ag-30aG6B) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-9oaqYI/ag-OpaiXI) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:16 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:01 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2080,7 +2080,7 @@ re-associate accordingly. Some administrators prefer to avoid running \fCntpd\f[]\fR(@NTPD_MS@)\f[] continuously and run either -\fCntpdate\f[]\fR(8)\f[] +\fCsntp\f[]\fR(@SNTP_MS@)\f[] or \fCntpd\f[]\fR(@NTPD_MS@)\f[] \f\*[B-Font]\-q\f[] @@ -2170,7 +2170,7 @@ This value defaults to 1, but can be changed to any number from 1 to 15. .TP 7 .NOP \f\*[B-Font]minclock\f[] \f\*[I-Font]minclock\f[] -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than \f\*[B-Font]minclock\f[] associations remain. @@ -2897,12 +2897,15 @@ pulses will not be suppressed. .RS .TP 7 .NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[] -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the \f\*[B-Font]\-i\f[] option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the diff --git a/contrib/ntp/ntpd/ntp.conf.mdoc.in b/contrib/ntp/ntpd/ntp.conf.mdoc.in index 93c638d..613ee7a 100644 --- a/contrib/ntp/ntpd/ntp.conf.mdoc.in +++ b/contrib/ntp/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:36 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:24 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -1903,7 +1903,7 @@ re\-associate accordingly. Some administrators prefer to avoid running .Xr ntpd @NTPD_MS@ continuously and run either -.Xr ntpdate 8 +.Xr sntp @SNTP_MS@ or .Xr ntpd @NTPD_MS@ .Fl q @@ -1995,7 +1995,7 @@ peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. .It Cm minclock Ar minclock -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than .Cm minclock associations remain. @@ -2725,12 +2725,15 @@ pulses will not be suppressed. .Xc .Bl -tag -width indent .It Cm memlock Ar Nmegabytes -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the .Fl i option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non\-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the .Fn mlockall diff --git a/contrib/ntp/ntpd/ntp.keys.5man b/contrib/ntp/ntpd/ntp.keys.5man index 63d4553..3e5cb54 100644 --- a/contrib/ntp/ntpd/ntp.keys.5man +++ b/contrib/ntp/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "29 Jun 2015" "4.2.8p3" "File Formats" +.TH ntp.keys 5man "21 Oct 2015" "4.2.8p4" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:08 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp.keys.5mdoc b/contrib/ntp/ntpd/ntp.keys.5mdoc index 47e5f81..6355a39 100644 --- a/contrib/ntp/ntpd/ntp.keys.5mdoc +++ b/contrib/ntp/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:28 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp.keys.html b/contrib/ntp/ntpd/ntp.keys.html index f096f63..3671aaa 100644 --- a/contrib/ntp/ntpd/ntp.keys.html +++ b/contrib/ntp/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: <a rel="up" accesskey="u" href="#dir">(dir)</a> <p>This document describes the symmetric key file for the NTP Project's <code>ntpd</code> program. - <p>This document applies to version 4.2.8p3 of <code>ntp.keys</code>. + <p>This document applies to version 4.2.8p4 of <code>ntp.keys</code>. <div class="shortcontents"> <h2>Short Contents</h2> diff --git a/contrib/ntp/ntpd/ntp.keys.man.in b/contrib/ntp/ntpd/ntp.keys.man.in index 1080b91..bd64756 100644 --- a/contrib/ntp/ntpd/ntp.keys.man.in +++ b/contrib/ntp/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "29 Jun 2015" "4.2.8p3" "File Formats" +.TH ntp.keys 5 "21 Oct 2015" "4.2.8p4" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:21 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:08 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp.keys.mdoc.in b/contrib/ntp/ntpd/ntp.keys.mdoc.in index 6bd1c09..6600d57 100644 --- a/contrib/ntp/ntpd/ntp.keys.mdoc.in +++ b/contrib/ntp/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:39 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:28 PM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/contrib/ntp/ntpd/ntp_config.c b/contrib/ntp/ntpd/ntp_config.c index 3007732..1c754bd 100644 --- a/contrib/ntp/ntpd/ntp_config.c +++ b/contrib/ntp/ntpd/ntp_config.c @@ -53,13 +53,21 @@ #include "ntp_parser.h" #include "ntpd-opts.h" +/* Bug 2817 */ +#if defined(HAVE_SYS_MMAN_H) +# include <sys/mman.h> +#endif /* list of servers from command line for config_peers() */ int cmdline_server_count; char ** cmdline_servers; -/* set to zero if admin doesn't want memory locked */ -int do_memlock = 1; +/* Current state of memory locking: + * -1: default + * 0: memory locking disabled + * 1: Memory locking enabled + */ +int cur_memlock = -1; /* * "logconfig" building blocks @@ -1152,9 +1160,8 @@ create_address_node( { address_node *my_node; - NTP_REQUIRE(NULL != addr); - NTP_REQUIRE(AF_INET == type || - AF_INET6 == type || AF_UNSPEC == type); + REQUIRE(NULL != addr); + REQUIRE(AF_INET == type || AF_INET6 == type || AF_UNSPEC == type); my_node = emalloc_zero(sizeof(*my_node)); my_node->address = addr; my_node->type = (u_short)type; @@ -1170,7 +1177,7 @@ destroy_address_node( { if (NULL == my_node) return; - NTP_REQUIRE(NULL != my_node->address); + REQUIRE(NULL != my_node->address); free(my_node->address); free(my_node); @@ -1567,7 +1574,7 @@ create_nic_rule_node( { nic_rule_node *my_node; - NTP_REQUIRE(match_class != 0 || if_name != NULL); + REQUIRE(match_class != 0 || if_name != NULL); my_node = emalloc_zero(sizeof(*my_node)); my_node->match_class = match_class; @@ -1826,7 +1833,9 @@ config_auth( /* Crypto Command */ #ifdef AUTOKEY +# ifdef __GNUC__ item = -1; /* quiet warning */ +# endif my_val = HEAD_PFIFO(ptree->auth.crypto_cmd_list); for (; my_val != NULL; my_val = my_val->link) { switch (my_val->attr) { @@ -1979,7 +1988,9 @@ config_tos( int item; double val; +#ifdef __GNUC__ item = -1; /* quiet warning */ +#endif tos = HEAD_PFIFO(ptree->orphan_cmds); for (; tos != NULL; tos = tos->link) { val = tos->value.d; @@ -2610,18 +2621,36 @@ config_rlimit( break; case T_Memlock: - if (rlimit_av->value.i != 0) { + /* What if we HAVE_OPT(SAVECONFIGQUIT) ? */ + if (rlimit_av->value.i == -1) { +# if defined(HAVE_MLOCKALL) + if (cur_memlock != 0) { + if (-1 == munlockall()) { + msyslog(LOG_ERR, "munlockall() failed: %m"); + } + } + cur_memlock = 0; +# endif /* HAVE_MLOCKALL */ + } else if (rlimit_av->value.i >= 0) { #if defined(RLIMIT_MEMLOCK) +# if defined(HAVE_MLOCKALL) + if (cur_memlock != 1) { + if (-1 == mlockall(MCL_CURRENT|MCL_FUTURE)) { + msyslog(LOG_ERR, "mlockall() failed: %m"); + } + } +# endif /* HAVE_MLOCKALL */ ntp_rlimit(RLIMIT_MEMLOCK, (rlim_t)(rlimit_av->value.i * 1024 * 1024), 1024 * 1024, "MB"); + cur_memlock = 1; #else /* STDERR as well would be fine... */ msyslog(LOG_WARNING, "'rlimit memlock' specified but is not available on this system."); #endif /* RLIMIT_MEMLOCK */ } else { - do_memlock = 0; + msyslog(LOG_WARNING, "'rlimit memlock' value of %d is unexpected!", rlimit_av->value.i); } break; @@ -2662,7 +2691,9 @@ config_tinker( attr_val * tinker; int item; +#ifdef __GNUC__ item = -1; /* quiet warning */ +#endif tinker = HEAD_PFIFO(ptree->tinker); for (; tinker != NULL; tinker = tinker->link) { switch (tinker->attr) { @@ -2776,12 +2807,14 @@ config_nic_rules( switch (curr_node->match_class) { default: +#ifdef __GNUC__ /* * this assignment quiets a gcc "may be used * uninitialized" warning and is here for no * other reason. */ match_type = MATCH_ALL; +#endif INSIST(FALSE); break; @@ -2834,12 +2867,14 @@ config_nic_rules( switch (curr_node->action) { default: +#ifdef __GNUC__ /* * this assignment quiets a gcc "may be used * uninitialized" warning and is here for no * other reason. */ action = ACTION_LISTEN; +#endif INSIST(FALSE); break; @@ -4880,9 +4915,9 @@ getnetnum( enum gnn_type a_type /* ignored */ ) { - NTP_REQUIRE(AF_UNSPEC == AF(addr) || - AF_INET == AF(addr) || - AF_INET6 == AF(addr)); + REQUIRE(AF_UNSPEC == AF(addr) || + AF_INET == AF(addr) || + AF_INET6 == AF(addr)); if (!is_ip_address(num, AF(addr), addr)) return 0; diff --git a/contrib/ntp/ntpd/ntp_control.c b/contrib/ntp/ntpd/ntp_control.c index 8ad1faf..7736311 100644 --- a/contrib/ntp/ntpd/ntp_control.c +++ b/contrib/ntp/ntpd/ntp_control.c @@ -3,10 +3,6 @@ * traps. Provides service to ntpq and others. */ -/* - * $FreeBSD: stable/10/contrib/ntp/ntpd/ntp_control.c 276072 2014-12-22 19:07:16Z delphij $ - */ - #ifdef HAVE_CONFIG_H # include <config.h> #endif @@ -32,15 +28,11 @@ #include "ntp_leapsec.h" #include "ntp_md5.h" /* provides OpenSSL digest API */ #include "lib_strbuf.h" +#include <rc_cmdlength.h> #ifdef KERNEL_PLL # include "ntp_syscall.h" #endif -extern size_t remoteconfig_cmdlength( const char *src_buf, const char *src_end ); - -#ifndef MIN -#define MIN(a, b) (((a) <= (b)) ? (a) : (b)) -#endif /* * Structure to hold request procedure information @@ -428,10 +420,10 @@ static const struct ctl_var sys_var[] = { { CS_TIMER_XMTS, RO, "timer_xmts" }, /* 87 */ { CS_FUZZ, RO, "fuzz" }, /* 88 */ { CS_WANDER_THRESH, RO, "clk_wander_threshold" }, /* 89 */ -#ifdef LEAP_SMEAR + { CS_LEAPSMEARINTV, RO, "leapsmearinterval" }, /* 90 */ { CS_LEAPSMEAROFFS, RO, "leapsmearoffset" }, /* 91 */ -#endif /* LEAP_SMEAR */ + #ifdef AUTOKEY { CS_FLAGS, RO, "flags" }, /* 1 + CS_MAX_NOAUTOKEY */ { CS_HOST, RO, "host" }, /* 2 + CS_MAX_NOAUTOKEY */ @@ -892,6 +884,28 @@ save_config( int restrict_mask ) { + /* block directory traversal by searching for characters that + * indicate directory components in a file path. + * + * Conceptually we should be searching for DIRSEP in filename, + * however Windows actually recognizes both forward and + * backslashes as equivalent directory separators at the API + * level. On POSIX systems we could allow '\\' but such + * filenames are tricky to manipulate from a shell, so just + * reject both types of slashes on all platforms. + */ + /* TALOS-CAN-0062: block directory traversal for VMS, too */ + static const char * illegal_in_filename = +#if defined(VMS) + ":[]" /* do not allow drive and path components here */ +#elif defined(SYS_WINNT) + ":\\/" /* path and drive separators */ +#else + "\\/" /* separator and critical char for POSIX */ +#endif + ; + + char reply[128]; #ifdef SAVECONFIG char filespec[128]; @@ -946,15 +960,9 @@ save_config( localtime(&now))) strlcpy(filename, filespec, sizeof(filename)); - /* - * Conceptually we should be searching for DIRSEP in filename, - * however Windows actually recognizes both forward and - * backslashes as equivalent directory separators at the API - * level. On POSIX systems we could allow '\\' but such - * filenames are tricky to manipulate from a shell, so just - * reject both types of slashes on all platforms. - */ - if (strchr(filename, '\\') || strchr(filename, '/')) { + /* block directory/drive traversal */ + /* TALOS-CAN-0062: block directory traversal for VMS, too */ + if (NULL != strpbrk(filename, illegal_in_filename)) { snprintf(reply, sizeof(reply), "saveconfig does not allow directory in filename"); ctl_putdata(reply, strlen(reply), 0); @@ -1409,7 +1417,7 @@ ctl_putstr( memcpy(buffer, tag, tl); cp = buffer + tl; if (len > 0) { - NTP_INSIST(tl + 3 + len <= sizeof(buffer)); + INSIST(tl + 3 + len <= sizeof(buffer)); *cp++ = '='; *cp++ = '"'; memcpy(cp, data, len); @@ -1444,7 +1452,7 @@ ctl_putunqstr( memcpy(buffer, tag, tl); cp = buffer + tl; if (len > 0) { - NTP_INSIST(tl + 1 + len <= sizeof(buffer)); + INSIST(tl + 1 + len <= sizeof(buffer)); *cp++ = '='; memcpy(cp, data, len); cp += len; @@ -1473,7 +1481,7 @@ ctl_putdblf( while (*cq != '\0') *cp++ = *cq++; *cp++ = '='; - NTP_INSIST((size_t)(cp - buffer) < sizeof(buffer)); + INSIST((size_t)(cp - buffer) < sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), use_f ? "%.*f" : "%.*g", precision, d); cp += strlen(cp); @@ -1499,7 +1507,7 @@ ctl_putuint( *cp++ = *cq++; *cp++ = '='; - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "%lu", uval); cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); @@ -1526,7 +1534,7 @@ ctl_putcal( pcal->hour, pcal->minute ); - NTP_INSIST(numch < sizeof(buffer)); + INSIST(numch < sizeof(buffer)); ctl_putdata(buffer, numch, 0); return; @@ -1557,7 +1565,7 @@ ctl_putfs( tm = gmtime(&fstamp); if (NULL == tm) return; - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "%04d%02d%02d%02d%02d", tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min); @@ -1586,7 +1594,7 @@ ctl_puthex( *cp++ = *cq++; *cp++ = '='; - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%lx", uval); cp += strlen(cp); ctl_putdata(buffer,(unsigned)( cp - buffer ), 0); @@ -1612,7 +1620,7 @@ ctl_putint( *cp++ = *cq++; *cp++ = '='; - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "%ld", ival); cp += strlen(cp); ctl_putdata(buffer, (unsigned)( cp - buffer ), 0); @@ -1638,7 +1646,7 @@ ctl_putts( *cp++ = *cq++; *cp++ = '='; - NTP_INSIST((size_t)(cp - buffer) < sizeof(buffer)); + INSIST((size_t)(cp - buffer) < sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "0x%08x.%08x", (u_int)ts->l_ui, (u_int)ts->l_uf); cp += strlen(cp); @@ -1670,7 +1678,7 @@ ctl_putadr( cq = numtoa(addr32); else cq = stoa(addr); - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), "%s", cq); cp += strlen(cp); ctl_putdata(buffer, (unsigned)(cp - buffer), 0); @@ -1741,7 +1749,7 @@ ctl_putarray( if (i == 0) i = NTP_SHIFT; i--; - NTP_INSIST((cp - buffer) < (int)sizeof(buffer)); + INSIST((cp - buffer) < (int)sizeof(buffer)); snprintf(cp, sizeof(buffer) - (cp - buffer), " %.2f", arr[i] * 1e3); cp += strlen(cp); @@ -2410,6 +2418,9 @@ ctl_putsys( ntohl(hostval.tstamp)); break; #endif /* AUTOKEY */ + + default: + break; } } @@ -2933,7 +2944,6 @@ ctl_getitem( * Look for a first character match on the tag. If we find * one, see if it is a full match. */ - v = var_list; cp = reqpt; for (v = var_list; !(EOV & v->flags); v++) { if (!(PADDING & v->flags) && *cp == *(v->text)) { @@ -3115,7 +3125,7 @@ read_peervars(void) ctl_error(CERR_UNKNOWNVAR); return; } - NTP_INSIST(v->code < COUNTOF(wants)); + INSIST(v->code < COUNTOF(wants)); wants[v->code] = 1; gotvar = 1; } @@ -3158,19 +3168,19 @@ read_sysvars(void) gotvar = 0; while (NULL != (v = ctl_getitem(sys_var, &valuep))) { if (!(EOV & v->flags)) { - NTP_INSIST(v->code < wants_count); + INSIST(v->code < wants_count); wants[v->code] = 1; gotvar = 1; } else { v = ctl_getitem(ext_sys_var, &valuep); - NTP_INSIST(v != NULL); + INSIST(v != NULL); if (EOV & v->flags) { ctl_error(CERR_UNKNOWNVAR); free(wants); return; } n = v->code + CS_MAXCODE + 1; - NTP_INSIST(n < wants_count); + INSIST(n < wants_count); wants[n] = 1; gotvar = 1; } @@ -4404,7 +4414,7 @@ read_clockstatus( gotvar = TRUE; } else { v = ctl_getitem(kv, &valuep); - NTP_INSIST(NULL != v); + INSIST(NULL != v); if (EOV & v->flags) { ctl_error(CERR_UNKNOWNVAR); free(wants); @@ -4800,7 +4810,7 @@ report_event( for (i = 1; i <= CS_VARLIST; i++) ctl_putsys(i); } else { - NTP_INSIST(peer != NULL); + INSIST(peer != NULL); rpkt.associd = htons(peer->associd); rpkt.status = htons(ctlpeerstatus(peer)); @@ -4905,7 +4915,7 @@ count_var( while (!(EOV & (k++)->flags)) c++; - NTP_ENSURE(c <= USHRT_MAX); + ENSURE(c <= USHRT_MAX); return (u_short)c; } diff --git a/contrib/ntp/ntpd/ntp_crypto.c b/contrib/ntp/ntpd/ntp_crypto.c index 2be501d..376b5b5 100644 --- a/contrib/ntp/ntpd/ntp_crypto.c +++ b/contrib/ntp/ntpd/ntp_crypto.c @@ -202,6 +202,7 @@ static void cert_free (struct cert_info *); static struct pkey_info *crypto_key (char *, char *, sockaddr_u *); static void bighash (BIGNUM *, BIGNUM *); static struct cert_info *crypto_cert (char *); +static u_int exten_payload_size(const struct exten *); #ifdef SYS_WINNT int @@ -380,7 +381,7 @@ make_keylist( EVP_SignUpdate(&ctx, (u_char *)vp, 12); EVP_SignUpdate(&ctx, vp->ptr, sizeof(struct autokey)); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); peer->flags |= FLAG_ASSOC; } @@ -419,7 +420,7 @@ crypto_recv( struct autokey *ap, *bp; /* autokey pointer */ struct exten *ep, *fp; /* extension pointers */ struct cert_info *xinfo; /* certificate info pointer */ - int has_mac; /* length of MAC field */ + int macbytes; /* length of MAC field, signed by intention */ int authlen; /* offset of MAC field */ associd_t associd; /* association ID */ tstamp_t fstamp = 0; /* filestamp */ @@ -446,7 +447,11 @@ crypto_recv( */ authlen = LEN_PKT_NOMAC; hismode = (int)PKT_MODE((&rbufp->recv_pkt)->li_vn_mode); - while ((has_mac = rbufp->recv_length - authlen) > (int)MAX_MAC_LEN) { + while ((macbytes = rbufp->recv_length - authlen) > (int)MAX_MAC_LEN) { + /* We can be reasonably sure that we can read at least + * the opcode and the size field here. More stringent + * checks follow up shortly. + */ pkt = (u_int32 *)&rbufp->recv_pkt + authlen / 4; ep = (struct exten *)pkt; code = ntohl(ep->opcode) & 0xffff0000; @@ -467,6 +472,18 @@ crypto_recv( code |= CRYPTO_ERROR; } + /* Check if the declared size fits into the remaining + * buffer. + */ + if (len > macbytes) { + DPRINTF(1, ("crypto_recv: possible attack detected, associd %d\n", + associd)); + return XEVNT_LEN; + } + + /* Check if the paylod of the extension fits into the + * declared frame. + */ if (len >= VALUE_LEN) { fstamp = ntohl(ep->fstamp); vallen = ntohl(ep->vallen); @@ -508,6 +525,7 @@ crypto_recv( rval = XEVNT_ERR; break; } + free(peer->cmmd); /* will be set again! */ } fp = emalloc(len); memcpy(fp, ep, len); @@ -1153,9 +1171,8 @@ crypto_xmit( * choice. */ case CRYPTO_CERT | CRYPTO_RESP: - vallen = ntohl(ep->vallen); /* Must be <64k */ - if (vallen == 0 || vallen > MAXHOSTNAME || - len - VALUE_LEN < vallen) { + vallen = exten_payload_size(ep); /* Must be <64k */ + if (vallen == 0 || vallen >= sizeof(certname) ) { rval = XEVNT_LEN; break; } @@ -1591,7 +1608,7 @@ crypto_encrypt( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, vallen); if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) { - NTP_INSIST(vallen <= sign_siglen); + INSIST(vallen <= sign_siglen); vp->siglen = htonl(vallen); } return (XEVNT_OK); @@ -1770,7 +1787,7 @@ crypto_send( if (j * 4 < siglen) ep->pkt[i + j++] = 0; memcpy(&ep->pkt[i], vp->sig, siglen); - i += j; + /* i += j; */ /* We don't use i after this */ } opcode = ntohl(ep->opcode); ep->opcode = htonl((opcode & 0xffff0000) | len); @@ -1825,7 +1842,7 @@ crypto_update(void) EVP_SignUpdate(&ctx, (u_char *)&pubkey, 12); EVP_SignUpdate(&ctx, pubkey.ptr, ntohl(pubkey.vallen)); if (EVP_SignFinal(&ctx, pubkey.sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); pubkey.siglen = htonl(len); } } @@ -1846,7 +1863,7 @@ crypto_update(void) EVP_SignUpdate(&ctx, cp->cert.ptr, ntohl(cp->cert.vallen)); if (EVP_SignFinal(&ctx, cp->cert.sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); cp->cert.siglen = htonl(len); } } @@ -1896,7 +1913,7 @@ crypto_update(void) EVP_SignUpdate(&ctx, (u_char *)&tai_leap, 12); EVP_SignUpdate(&ctx, tai_leap.ptr, len); if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); tai_leap.siglen = htonl(len); } crypto_flags |= CRYPTO_FLAG_TAI; @@ -1997,9 +2014,9 @@ asn_to_calendar ( * 100. Dontcha love ASN.1? Better than MIL-188. */ len = asn1time->length; - NTP_REQUIRE(len < sizeof(v)); + REQUIRE(len < sizeof(v)); (void)strncpy(v, (char *)(asn1time->data), len); - NTP_REQUIRE(len >= 13); + REQUIRE(len >= 13); temp = strtoul(v+len-3, NULL, 10); pjd->second = temp; v[len-3] = '\0'; @@ -2169,7 +2186,7 @@ crypto_alice( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } return (XEVNT_OK); @@ -2197,8 +2214,7 @@ crypto_bob( tstamp_t tstamp; /* NTP timestamp */ BIGNUM *bn, *bk, *r; u_char *ptr; - u_int len; /* extension field length */ - u_int vallen = 0; /* value length */ + u_int len; /* extension field value length */ /* * If the IFF parameters are not valid, something awful @@ -2213,11 +2229,10 @@ crypto_bob( /* * Extract r from the challenge. */ - vallen = ntohl(ep->vallen); - len = ntohl(ep->opcode) & 0x0000ffff; - if (vallen == 0 || len < VALUE_LEN || len - VALUE_LEN < vallen) - return XEVNT_LEN; - if ((r = BN_bin2bn((u_char *)ep->pkt, vallen, NULL)) == NULL) { + len = exten_payload_size(ep); + if (len == 0 || len > MAX_VALLEN) + return (XEVNT_LEN); + if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) { msyslog(LOG_ERR, "crypto_bob: %s", ERR_error_string(ERR_get_error(), NULL)); return (XEVNT_ERR); @@ -2229,7 +2244,7 @@ crypto_bob( */ bctx = BN_CTX_new(); bk = BN_new(); bn = BN_new(); sdsa = DSA_SIG_new(); - BN_rand(bk, vallen * 8, -1, 1); /* k */ + BN_rand(bk, len * 8, -1, 1); /* k */ BN_mod_mul(bn, dsa->priv_key, r, dsa->q, bctx); /* b r mod q */ BN_add(bn, bn, bk); BN_mod(bn, bn, dsa->q, bctx); /* k + b r mod q */ @@ -2248,16 +2263,16 @@ crypto_bob( * Encode the values in ASN.1 and sign. The filestamp is from * the local file. */ - vallen = i2d_DSA_SIG(sdsa, NULL); - if (vallen == 0) { + len = i2d_DSA_SIG(sdsa, NULL); + if (len == 0) { msyslog(LOG_ERR, "crypto_bob: %s", ERR_error_string(ERR_get_error(), NULL)); DSA_SIG_free(sdsa); return (XEVNT_ERR); } - if (vallen > MAX_VALLEN) { - msyslog(LOG_ERR, "crypto_bob: signature is too big: %d", - vallen); + if (len > MAX_VALLEN) { + msyslog(LOG_ERR, "crypto_bob: signature is too big: %u", + len); DSA_SIG_free(sdsa); return (XEVNT_LEN); } @@ -2265,8 +2280,8 @@ crypto_bob( tstamp = crypto_time(); vp->tstamp = htonl(tstamp); vp->fstamp = htonl(iffkey_info->fstamp); - vp->vallen = htonl(vallen); - ptr = emalloc(vallen); + vp->vallen = htonl(len); + ptr = emalloc(len); vp->ptr = ptr; i2d_DSA_SIG(sdsa, &ptr); DSA_SIG_free(sdsa); @@ -2277,10 +2292,10 @@ crypto_bob( vp->sig = emalloc(sign_siglen); EVP_SignInit(&ctx, sign_digest); EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); - EVP_SignUpdate(&ctx, vp->ptr, vallen); - if (EVP_SignFinal(&ctx, vp->sig, &vallen, sign_pkey)) { - NTP_INSIST(vallen <= sign_siglen); - vp->siglen = htonl(vallen); + EVP_SignUpdate(&ctx, vp->ptr, len); + if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { + INSIST(len <= sign_siglen); + vp->siglen = htonl(len); } return (XEVNT_OK); } @@ -2486,7 +2501,7 @@ crypto_alice2( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } return (XEVNT_OK); @@ -2530,7 +2545,9 @@ crypto_bob2( /* * Extract r from the challenge. */ - len = ntohl(ep->vallen); + len = exten_payload_size(ep); + if (len == 0 || len > MAX_VALLEN) + return (XEVNT_LEN); if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) { msyslog(LOG_ERR, "crypto_bob2: %s", ERR_error_string(ERR_get_error(), NULL)); @@ -2586,7 +2603,7 @@ crypto_bob2( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } return (XEVNT_OK); @@ -2817,7 +2834,7 @@ crypto_alice3( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } return (XEVNT_OK); @@ -2859,7 +2876,9 @@ crypto_bob3( /* * Extract r from the challenge. */ - len = ntohl(ep->vallen); + len = exten_payload_size(ep); + if (len == 0 || len > MAX_VALLEN) + return (XEVNT_LEN); if ((r = BN_bin2bn((u_char *)ep->pkt, len, NULL)) == NULL) { msyslog(LOG_ERR, "crypto_bob3: %s", ERR_error_string(ERR_get_error(), NULL)); @@ -2919,7 +2938,7 @@ crypto_bob3( EVP_SignUpdate(&ctx, (u_char *)&vp->tstamp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } return (XEVNT_OK); @@ -3078,8 +3097,11 @@ cert_sign( if (tstamp == 0) return (XEVNT_TSP); + len = exten_payload_size(ep); + if (len == 0 || len > MAX_VALLEN) + return (XEVNT_LEN); cptr = (void *)ep->pkt; - if ((req = d2i_X509(NULL, &cptr, ntohl(ep->vallen))) == NULL) { + if ((req = d2i_X509(NULL, &cptr, len)) == NULL) { msyslog(LOG_ERR, "cert_sign: %s", ERR_error_string(ERR_get_error(), NULL)); return (XEVNT_CRT); @@ -3158,7 +3180,7 @@ cert_sign( EVP_SignUpdate(&ctx, (u_char *)vp, 12); EVP_SignUpdate(&ctx, vp->ptr, len); if (EVP_SignFinal(&ctx, vp->sig, &len, sign_pkey)) { - NTP_INSIST(len <= sign_siglen); + INSIST(len <= sign_siglen); vp->siglen = htonl(len); } } @@ -4028,6 +4050,36 @@ crypto_config( break; } } + +/* + * Get the payload size (internal value length) of an extension packet. + * If the inner value size does not match the outer packet size (that + * is, the value would end behind the frame given by the opcode/size + * field) the function will effectively return UINT_MAX. If the frame is + * too short to hold a variable-sized value, the return value is zero. + */ +static u_int +exten_payload_size( + const struct exten * ep) +{ + typedef const u_char *BPTR; + + size_t extn_size; + size_t data_size; + size_t head_size; + + data_size = 0; + if (NULL != ep) { + head_size = (BPTR)(&ep->vallen + 1) - (BPTR)ep; + extn_size = (uint16_t)(ntohl(ep->opcode) & 0x0000ffff); + if (extn_size >= head_size) { + data_size = (uint32_t)ntohl(ep->vallen); + if (data_size > extn_size - head_size) + data_size = ~(size_t)0u; + } + } + return (u_int)data_size; +} # else /* !AUTOKEY follows */ int ntp_crypto_bs_pubkey; # endif /* !AUTOKEY */ diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 2b5a003..5fc6ed5 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -216,7 +216,7 @@ static int is_wildcard_addr (const sockaddr_u *); * Multicast functions */ static isc_boolean_t addr_ismulticast (sockaddr_u *); -static isc_boolean_t is_not_bindable (sockaddr_u *, +static isc_boolean_t is_anycast (sockaddr_u *, const char *); /* @@ -371,7 +371,7 @@ maintain_activefds( maxactivefd = i; break; } - NTP_INSIST(fd != maxactivefd); + INSIST(fd != maxactivefd); } } } @@ -687,8 +687,8 @@ addr_samesubnet( const u_int32 * pm; size_t loops; - NTP_REQUIRE(AF(a) == AF(a_mask)); - NTP_REQUIRE(AF(b) == AF(b_mask)); + REQUIRE(AF(a) == AF(a_mask)); + REQUIRE(AF(b) == AF(b_mask)); /* * With address and mask families verified to match, comparing * the masks also validates the address's families match. @@ -735,8 +735,8 @@ is_ip_address( char tmpbuf[128]; char *pch; - NTP_REQUIRE(host != NULL); - NTP_REQUIRE(addr != NULL); + REQUIRE(host != NULL); + REQUIRE(addr != NULL); ZERO_SOCK(addr); @@ -1250,15 +1250,15 @@ add_nic_rule( rule->action = action; if (MATCH_IFNAME == match_type) { - NTP_REQUIRE(NULL != if_name); + REQUIRE(NULL != if_name); rule->if_name = estrdup(if_name); } else if (MATCH_IFADDR == match_type) { - NTP_REQUIRE(NULL != if_name); + REQUIRE(NULL != if_name); /* set rule->addr */ is_ip = is_ip_address(if_name, AF_UNSPEC, &rule->addr); - NTP_REQUIRE(is_ip); + REQUIRE(is_ip); } else - NTP_REQUIRE(NULL == if_name); + REQUIRE(NULL == if_name); LINK_SLIST(nic_rule_list, rule, next); } @@ -1278,7 +1278,7 @@ action_text( t = "ERROR"; /* quiet uninit warning */ DPRINTF(1, ("fatal: unknown nic_rule_action %d\n", action)); - NTP_ENSURE(0); + ENSURE(0); break; case ACTION_LISTEN: @@ -1666,11 +1666,9 @@ check_flags6( u_int32 flags6 ) { -#if defined(INCLUDE_IPV6_SUPPORT) && defined(SIOCGIFAFLAG_IN6) && \ - (defined(IN6_IFF_ANYCAST) || defined(IN6_IFF_NOTREADY)) +#if defined(INCLUDE_IPV6_SUPPORT) && defined(SIOCGIFAFLAG_IN6) struct in6_ifreq ifr6; int fd; - u_int32 exclude = 0; if (psau->sa.sa_family != AF_INET6) return ISC_FALSE; @@ -1684,21 +1682,14 @@ check_flags6( return ISC_FALSE; } close(fd); - flags6 = ifr6.ifr_ifru.ifru_flags6; -#if defined(IN6_IFF_ANYCAST) - exclude |= IN6_IFF_ANYCAST; -#endif /* !IN6_IFF_ANYCAST */ -#if defined(IN6_IFF_NOTREADY) - exclude |= IN6_IFF_NOTREADY; -#endif /* !IN6_IFF_NOTREADY */ - if ((flags6 & exclude) != 0) + if ((ifr6.ifr_ifru.ifru_flags6 & flags6) != 0) return ISC_TRUE; -#endif /* INCLUDE_IPV6_SUPPORT && SIOCGIFAFLAG_IN6 && (IN6_IFF_ANYCAST && IN6_IFF_NOTREADY) */ +#endif /* INCLUDE_IPV6_SUPPORT && SIOCGIFAFLAG_IN6 */ return ISC_FALSE; } static isc_boolean_t -is_not_bindable( +is_anycast( sockaddr_u *psau, const char *name ) @@ -1859,7 +1850,7 @@ update_interfaces( if (is_wildcard_addr(&enumep.sin)) continue; - if (is_not_bindable(&enumep.sin, isc_if.name)) + if (is_anycast(&enumep.sin, isc_if.name)) continue; /* @@ -2031,6 +2022,7 @@ update_interfaces( if (sys_bclient) io_setbclient(); +#ifdef MCAST /* * Check multicast interfaces and try to join multicast groups if * not joined yet. @@ -2056,6 +2048,7 @@ update_interfaces( } } } +#endif /* MCAST */ return new_interface_found; } @@ -2406,7 +2399,7 @@ enable_multicast_if( u_int off6 = 0; #endif - NTP_REQUIRE(AF(maddr) == AF(&iface->sin)); + REQUIRE(AF(maddr) == AF(&iface->sin)); switch (AF(&iface->sin)) { @@ -2466,9 +2459,9 @@ socket_multicast_enable( ) { struct ip_mreq mreq; -#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT +# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT struct ipv6_mreq mreq6; -#endif +# endif switch (AF(maddr)) { case AF_INET: @@ -2495,7 +2488,7 @@ socket_multicast_enable( break; case AF_INET6: -#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT +# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT /* * Enable reception of multicast packets. * If the address is link-local we can get the @@ -2519,9 +2512,9 @@ socket_multicast_enable( DPRINTF(4, ("Added IPv6 multicast group on socket %d, addr %s for interface %u (%s)\n", iface->fd, stoa(&iface->sin), mreq6.ipv6mr_interface, stoa(maddr))); -#else +# else return ISC_FALSE; -#endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */ +# endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */ } iface->flags |= INT_MCASTOPEN; iface->num_mcast++; @@ -2543,9 +2536,9 @@ socket_multicast_disable( sockaddr_u * maddr ) { -#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT +# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT struct ipv6_mreq mreq6; -#endif +# endif struct ip_mreq mreq; ZERO(mreq); @@ -2574,7 +2567,7 @@ socket_multicast_disable( } break; case AF_INET6: -#ifdef INCLUDE_IPV6_MULTICAST_SUPPORT +# ifdef INCLUDE_IPV6_MULTICAST_SUPPORT /* * Disable reception of multicast packets * If the address is link-local we can get the @@ -2596,9 +2589,9 @@ socket_multicast_disable( return ISC_FALSE; } break; -#else +# else return ISC_FALSE; -#endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */ +# endif /* INCLUDE_IPV6_MULTICAST_SUPPORT */ } iface->num_mcast--; @@ -2638,7 +2631,7 @@ io_setbclient(void) continue; /* Only IPv4 addresses are valid for broadcast */ - NTP_REQUIRE(IS_IPV4(&interf->sin)); + REQUIRE(IS_IPV4(&interf->sin)); /* Do we already have the broadcast address open? */ if (interf->flags & INT_BCASTOPEN) { @@ -2744,7 +2737,7 @@ io_multicast_add( return; } -#ifndef MULTICAST_NONEWSOCKET +# ifndef MULTICAST_NONEWSOCKET ep = new_interface(NULL); /* @@ -2794,7 +2787,7 @@ io_multicast_add( } { /* in place of the { following for in #else clause */ one_ep = ep; -#else /* MULTICAST_NONEWSOCKET follows */ +# else /* MULTICAST_NONEWSOCKET follows */ /* * For the case where we can't use a separate socket (Windows) * join each applicable endpoint socket to the group address. @@ -2809,7 +2802,7 @@ io_multicast_add( (INT_LOOPBACK | INT_WILDCARD) & ep->flags) continue; one_ep = ep; -#endif /* MULTICAST_NONEWSOCKET */ +# endif /* MULTICAST_NONEWSOCKET */ if (socket_multicast_enable(ep, addr)) msyslog(LOG_INFO, "Joined %s socket to multicast group %s", @@ -3249,7 +3242,7 @@ read_refclock_packet( l_fp ts ) { - int i; + u_int read_count; int buflen; int saved_errno; int consumed; @@ -3268,12 +3261,15 @@ read_refclock_packet( return (buflen); } - i = (rp->datalen == 0 - || rp->datalen > (int)sizeof(rb->recv_space)) - ? (int)sizeof(rb->recv_space) - : rp->datalen; + /* TALOS-CAN-0064: avoid signed/unsigned clashes that can lead + * to buffer overrun and memory corruption + */ + if (rp->datalen <= 0 || rp->datalen > sizeof(rb->recv_space)) + read_count = sizeof(rb->recv_space); + else + read_count = (u_int)rp->datalen; do { - buflen = read(fd, (char *)&rb->recv_space, (u_int)i); + buflen = read(fd, (char *)&rb->recv_space, read_count); } while (buflen < 0 && EINTR == errno); if (buflen <= 0) { @@ -4088,7 +4084,7 @@ calc_addr_distance( int a1_greater; int i; - NTP_REQUIRE(AF(a1) == AF(a2)); + REQUIRE(AF(a1) == AF(a2)); ZERO_SOCK(dist); AF(dist) = AF(a1); @@ -4139,7 +4135,7 @@ cmp_addr_distance( { int i; - NTP_REQUIRE(AF(d1) == AF(d2)); + REQUIRE(AF(d1) == AF(d2)); if (IS_IPV4(d1)) { if (SRCADR(d1) < SRCADR(d2)) @@ -4631,10 +4627,15 @@ process_routing_msgs(struct asyncio_reader *reader) cnt = read(reader->fd, buffer, sizeof(buffer)); if (cnt < 0) { - msyslog(LOG_ERR, - "i/o error on routing socket %m - disabling"); - remove_asyncio_reader(reader); - delete_asyncio_reader(reader); + if (errno == ENOBUFS) { + msyslog(LOG_ERR, + "routing socket reports: %m"); + } else { + msyslog(LOG_ERR, + "routing socket reports: %m - disabling"); + remove_asyncio_reader(reader); + delete_asyncio_reader(reader); + } return; } diff --git a/contrib/ntp/ntpd/ntp_loopfilter.c b/contrib/ntp/ntpd/ntp_loopfilter.c index cb183b9..42c30de 100644 --- a/contrib/ntp/ntpd/ntp_loopfilter.c +++ b/contrib/ntp/ntpd/ntp_loopfilter.c @@ -577,7 +577,7 @@ local_clock( switch (state) { /* - * In SYNC state we ignore the first outlyer and switch + * In SYNC state we ignore the first outlier and switch * to SPIK state. */ case EVNT_SYNC: @@ -588,8 +588,8 @@ local_clock( return (0); /* - * In FREQ state we ignore outlyers and inlyers. At the - * first outlyer after the stepout threshold, compute + * In FREQ state we ignore outliers and inlyers. At the + * first outlier after the stepout threshold, compute * the apparent frequency correction and step the phase. */ case EVNT_FREQ: @@ -601,7 +601,7 @@ local_clock( /* fall through to EVNT_SPIK */ /* - * In SPIK state we ignore succeeding outlyers until + * In SPIK state we ignore succeeding outliers until * either an inlyer is found or the stepout threshold is * exceeded. */ diff --git a/contrib/ntp/ntpd/ntp_monitor.c b/contrib/ntp/ntpd/ntp_monitor.c index 02fd757..a07a1aa 100644 --- a/contrib/ntp/ntpd/ntp_monitor.c +++ b/contrib/ntp/ntpd/ntp_monitor.c @@ -133,7 +133,7 @@ remove_from_hash( hash = MON_HASH(&mon->rmtadr); UNLINK_SLIST(punlinked, mon_hash[hash], mon, hash_next, mon_entry); - NTP_ENSURE(punlinked == mon); + ENSURE(punlinked == mon); } @@ -325,6 +325,8 @@ ntp_monitor( int leak; /* new headway */ int limit; /* average threshold */ + REQUIRE(rbufp != NULL); + if (mon_enabled == MON_OFF) return ~(RES_LIMITED | RES_KOD) & flags; @@ -466,6 +468,8 @@ ntp_monitor( } } + INSIST(mon != NULL); + /* * Got one, initialize it */ diff --git a/contrib/ntp/ntpd/ntp_parser.c b/contrib/ntp/ntpd/ntp_parser.c index d76ac33..6235033 100644 --- a/contrib/ntp/ntpd/ntp_parser.c +++ b/contrib/ntp/ntpd/ntp_parser.c @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.12-4996. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.7.12-4996" +#define YYBISON_VERSION "3.0.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,8 +62,7 @@ /* Copy the first part of user declarations. */ -/* Line 371 of yacc.c */ -#line 11 "../../ntpd/ntp_parser.y" +#line 11 "../../ntpd/ntp_parser.y" /* yacc.c:339 */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -97,14 +96,13 @@ # define ONLY_SIM(a) NULL #endif -/* Line 371 of yacc.c */ -#line 102 "ntp_parser.c" +#line 100 "../../ntpd/ntp_parser.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -118,9 +116,9 @@ /* In a future release of Bison, this section will be replaced by #include "y.tab.h". */ -#ifndef YY_YY_NTP_PARSER_H_INCLUDED -# define YY_YY_NTP_PARSER_H_INCLUDED -/* Enabling traces. */ +#ifndef YY_YY__NTPD_NTP_PARSER_H_INCLUDED +# define YY_YY__NTPD_NTP_PARSER_H_INCLUDED +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -128,204 +126,203 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - T_Abbrev = 258, - T_Age = 259, - T_All = 260, - T_Allan = 261, - T_Allpeers = 262, - T_Auth = 263, - T_Autokey = 264, - T_Automax = 265, - T_Average = 266, - T_Bclient = 267, - T_Beacon = 268, - T_Broadcast = 269, - T_Broadcastclient = 270, - T_Broadcastdelay = 271, - T_Burst = 272, - T_Calibrate = 273, - T_Ceiling = 274, - T_Clockstats = 275, - T_Cohort = 276, - T_ControlKey = 277, - T_Crypto = 278, - T_Cryptostats = 279, - T_Ctl = 280, - T_Day = 281, - T_Default = 282, - T_Digest = 283, - T_Disable = 284, - T_Discard = 285, - T_Dispersion = 286, - T_Double = 287, - T_Driftfile = 288, - T_Drop = 289, - T_Dscp = 290, - T_Ellipsis = 291, - T_Enable = 292, - T_End = 293, - T_False = 294, - T_File = 295, - T_Filegen = 296, - T_Filenum = 297, - T_Flag1 = 298, - T_Flag2 = 299, - T_Flag3 = 300, - T_Flag4 = 301, - T_Flake = 302, - T_Floor = 303, - T_Freq = 304, - T_Fudge = 305, - T_Host = 306, - T_Huffpuff = 307, - T_Iburst = 308, - T_Ident = 309, - T_Ignore = 310, - T_Incalloc = 311, - T_Incmem = 312, - T_Initalloc = 313, - T_Initmem = 314, - T_Includefile = 315, - T_Integer = 316, - T_Interface = 317, - T_Intrange = 318, - T_Io = 319, - T_Ipv4 = 320, - T_Ipv4_flag = 321, - T_Ipv6 = 322, - T_Ipv6_flag = 323, - T_Kernel = 324, - T_Key = 325, - T_Keys = 326, - T_Keysdir = 327, - T_Kod = 328, - T_Mssntp = 329, - T_Leapfile = 330, - T_Leapsmearinterval = 331, - T_Limited = 332, - T_Link = 333, - T_Listen = 334, - T_Logconfig = 335, - T_Logfile = 336, - T_Loopstats = 337, - T_Lowpriotrap = 338, - T_Manycastclient = 339, - T_Manycastserver = 340, - T_Mask = 341, - T_Maxage = 342, - T_Maxclock = 343, - T_Maxdepth = 344, - T_Maxdist = 345, - T_Maxmem = 346, - T_Maxpoll = 347, - T_Mdnstries = 348, - T_Mem = 349, - T_Memlock = 350, - T_Minclock = 351, - T_Mindepth = 352, - T_Mindist = 353, - T_Minimum = 354, - T_Minpoll = 355, - T_Minsane = 356, - T_Mode = 357, - T_Mode7 = 358, - T_Monitor = 359, - T_Month = 360, - T_Mru = 361, - T_Multicastclient = 362, - T_Nic = 363, - T_Nolink = 364, - T_Nomodify = 365, - T_Nomrulist = 366, - T_None = 367, - T_Nonvolatile = 368, - T_Nopeer = 369, - T_Noquery = 370, - T_Noselect = 371, - T_Noserve = 372, - T_Notrap = 373, - T_Notrust = 374, - T_Ntp = 375, - T_Ntpport = 376, - T_NtpSignDsocket = 377, - T_Orphan = 378, - T_Orphanwait = 379, - T_Panic = 380, - T_Peer = 381, - T_Peerstats = 382, - T_Phone = 383, - T_Pid = 384, - T_Pidfile = 385, - T_Pool = 386, - T_Port = 387, - T_Preempt = 388, - T_Prefer = 389, - T_Protostats = 390, - T_Pw = 391, - T_Randfile = 392, - T_Rawstats = 393, - T_Refid = 394, - T_Requestkey = 395, - T_Reset = 396, - T_Restrict = 397, - T_Revoke = 398, - T_Rlimit = 399, - T_Saveconfigdir = 400, - T_Server = 401, - T_Setvar = 402, - T_Source = 403, - T_Stacksize = 404, - T_Statistics = 405, - T_Stats = 406, - T_Statsdir = 407, - T_Step = 408, - T_Stepback = 409, - T_Stepfwd = 410, - T_Stepout = 411, - T_Stratum = 412, - T_String = 413, - T_Sys = 414, - T_Sysstats = 415, - T_Tick = 416, - T_Time1 = 417, - T_Time2 = 418, - T_Timer = 419, - T_Timingstats = 420, - T_Tinker = 421, - T_Tos = 422, - T_Trap = 423, - T_True = 424, - T_Trustedkey = 425, - T_Ttl = 426, - T_Type = 427, - T_U_int = 428, - T_Unconfig = 429, - T_Unpeer = 430, - T_Version = 431, - T_WanderThreshold = 432, - T_Week = 433, - T_Wildcard = 434, - T_Xleave = 435, - T_Year = 436, - T_Flag = 437, - T_EOC = 438, - T_Simulate = 439, - T_Beep_Delay = 440, - T_Sim_Duration = 441, - T_Server_Offset = 442, - T_Duration = 443, - T_Freq_Offset = 444, - T_Wander = 445, - T_Jitter = 446, - T_Prop_Delay = 447, - T_Proc_Delay = 448 - }; + enum yytokentype + { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Dscp = 290, + T_Ellipsis = 291, + T_Enable = 292, + T_End = 293, + T_False = 294, + T_File = 295, + T_Filegen = 296, + T_Filenum = 297, + T_Flag1 = 298, + T_Flag2 = 299, + T_Flag3 = 300, + T_Flag4 = 301, + T_Flake = 302, + T_Floor = 303, + T_Freq = 304, + T_Fudge = 305, + T_Host = 306, + T_Huffpuff = 307, + T_Iburst = 308, + T_Ident = 309, + T_Ignore = 310, + T_Incalloc = 311, + T_Incmem = 312, + T_Initalloc = 313, + T_Initmem = 314, + T_Includefile = 315, + T_Integer = 316, + T_Interface = 317, + T_Intrange = 318, + T_Io = 319, + T_Ipv4 = 320, + T_Ipv4_flag = 321, + T_Ipv6 = 322, + T_Ipv6_flag = 323, + T_Kernel = 324, + T_Key = 325, + T_Keys = 326, + T_Keysdir = 327, + T_Kod = 328, + T_Mssntp = 329, + T_Leapfile = 330, + T_Leapsmearinterval = 331, + T_Limited = 332, + T_Link = 333, + T_Listen = 334, + T_Logconfig = 335, + T_Logfile = 336, + T_Loopstats = 337, + T_Lowpriotrap = 338, + T_Manycastclient = 339, + T_Manycastserver = 340, + T_Mask = 341, + T_Maxage = 342, + T_Maxclock = 343, + T_Maxdepth = 344, + T_Maxdist = 345, + T_Maxmem = 346, + T_Maxpoll = 347, + T_Mdnstries = 348, + T_Mem = 349, + T_Memlock = 350, + T_Minclock = 351, + T_Mindepth = 352, + T_Mindist = 353, + T_Minimum = 354, + T_Minpoll = 355, + T_Minsane = 356, + T_Mode = 357, + T_Mode7 = 358, + T_Monitor = 359, + T_Month = 360, + T_Mru = 361, + T_Multicastclient = 362, + T_Nic = 363, + T_Nolink = 364, + T_Nomodify = 365, + T_Nomrulist = 366, + T_None = 367, + T_Nonvolatile = 368, + T_Nopeer = 369, + T_Noquery = 370, + T_Noselect = 371, + T_Noserve = 372, + T_Notrap = 373, + T_Notrust = 374, + T_Ntp = 375, + T_Ntpport = 376, + T_NtpSignDsocket = 377, + T_Orphan = 378, + T_Orphanwait = 379, + T_Panic = 380, + T_Peer = 381, + T_Peerstats = 382, + T_Phone = 383, + T_Pid = 384, + T_Pidfile = 385, + T_Pool = 386, + T_Port = 387, + T_Preempt = 388, + T_Prefer = 389, + T_Protostats = 390, + T_Pw = 391, + T_Randfile = 392, + T_Rawstats = 393, + T_Refid = 394, + T_Requestkey = 395, + T_Reset = 396, + T_Restrict = 397, + T_Revoke = 398, + T_Rlimit = 399, + T_Saveconfigdir = 400, + T_Server = 401, + T_Setvar = 402, + T_Source = 403, + T_Stacksize = 404, + T_Statistics = 405, + T_Stats = 406, + T_Statsdir = 407, + T_Step = 408, + T_Stepback = 409, + T_Stepfwd = 410, + T_Stepout = 411, + T_Stratum = 412, + T_String = 413, + T_Sys = 414, + T_Sysstats = 415, + T_Tick = 416, + T_Time1 = 417, + T_Time2 = 418, + T_Timer = 419, + T_Timingstats = 420, + T_Tinker = 421, + T_Tos = 422, + T_Trap = 423, + T_True = 424, + T_Trustedkey = 425, + T_Ttl = 426, + T_Type = 427, + T_U_int = 428, + T_Unconfig = 429, + T_Unpeer = 430, + T_Version = 431, + T_WanderThreshold = 432, + T_Week = 433, + T_Wildcard = 434, + T_Xleave = 435, + T_Year = 436, + T_Flag = 437, + T_EOC = 438, + T_Simulate = 439, + T_Beep_Delay = 440, + T_Sim_Duration = 441, + T_Server_Offset = 442, + T_Duration = 443, + T_Freq_Offset = 444, + T_Wander = 445, + T_Jitter = 446, + T_Prop_Delay = 447, + T_Proc_Delay = 448 + }; #endif /* Tokens. */ #define T_Abbrev 258 @@ -520,13 +517,12 @@ extern int yydebug; #define T_Prop_Delay 447 #define T_Proc_Delay 448 - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +typedef union YYSTYPE YYSTYPE; +union YYSTYPE { -/* Line 387 of yacc.c */ -#line 51 "../../ntpd/ntp_parser.y" +#line 51 "../../ntpd/ntp_parser.y" /* yacc.c:355 */ char * String; double Double; @@ -545,37 +541,22 @@ typedef union YYSTYPE script_info * Sim_script; script_info_fifo * Sim_script_fifo; - -/* Line 387 of yacc.c */ -#line 551 "ntp_parser.c" -} YYSTYPE; +#line 545 "../../ntpd/ntp_parser.c" /* yacc.c:355 */ +}; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ -#endif /* !YY_YY_NTP_PARSER_H_INCLUDED */ +#endif /* !YY_YY__NTPD_NTP_PARSER_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 390 of yacc.c */ -#line 579 "ntp_parser.c" +#line 560 "../../ntpd/ntp_parser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -589,11 +570,8 @@ typedef unsigned char yytype_uint8; #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -613,8 +591,7 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif ! defined YYSIZE_T # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -636,11 +613,30 @@ typedef short int yytype_int16; # endif #endif -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if (! defined __GNUC__ || __GNUC__ < 2 \ - || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) -# define __attribute__(Spec) /* empty */ +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) # endif #endif @@ -651,25 +647,26 @@ typedef short int yytype_int16; # define YYUSE(E) /* empty */ #endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(N) (N) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif + #if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -687,8 +684,7 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -700,8 +696,8 @@ YYID (yyi) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -717,7 +713,7 @@ YYID (yyi) # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -725,15 +721,13 @@ YYID (yyi) # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -743,7 +737,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -768,16 +762,16 @@ union yyalloc elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif @@ -796,7 +790,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -812,17 +806,19 @@ union yyalloc #define YYNNTS 105 /* YYNRULES -- Number of rules. */ #define YYNRULES 313 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 419 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 448 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -873,127 +869,7 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 5, 9, 12, 15, 16, 18, 20, - 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, - 42, 46, 48, 50, 52, 54, 56, 58, 61, 63, - 65, 67, 68, 71, 73, 75, 77, 79, 81, 83, - 85, 87, 89, 91, 93, 95, 98, 101, 103, 105, - 107, 109, 111, 113, 116, 118, 121, 123, 125, 127, - 130, 133, 136, 139, 142, 145, 148, 151, 154, 157, - 160, 163, 164, 167, 170, 173, 175, 177, 179, 181, - 183, 186, 189, 191, 194, 197, 200, 202, 204, 206, - 208, 210, 212, 214, 216, 218, 220, 223, 226, 230, - 233, 235, 237, 239, 241, 243, 245, 247, 249, 251, - 252, 255, 258, 261, 263, 265, 267, 269, 271, 273, - 275, 277, 279, 281, 283, 285, 287, 290, 293, 297, - 303, 307, 312, 317, 321, 322, 325, 327, 329, 331, - 333, 335, 337, 339, 341, 343, 345, 347, 349, 351, - 353, 355, 358, 360, 363, 365, 367, 369, 372, 374, - 377, 379, 381, 383, 385, 387, 389, 391, 393, 397, - 400, 402, 405, 408, 411, 414, 417, 419, 421, 423, - 425, 427, 429, 432, 435, 437, 440, 442, 444, 446, - 449, 452, 455, 457, 459, 461, 463, 465, 467, 469, - 471, 473, 475, 477, 480, 483, 485, 488, 490, 492, - 494, 496, 498, 500, 502, 504, 506, 508, 510, 512, - 515, 518, 521, 524, 528, 530, 533, 536, 539, 542, - 546, 549, 551, 553, 555, 557, 559, 561, 563, 565, - 567, 569, 571, 574, 575, 580, 582, 583, 584, 587, - 590, 593, 596, 598, 600, 604, 608, 610, 612, 614, - 616, 618, 620, 622, 624, 626, 629, 632, 634, 636, - 638, 640, 642, 644, 646, 648, 651, 653, 656, 658, - 660, 662, 668, 671, 673, 676, 678, 680, 682, 684, - 686, 688, 694, 696, 700, 703, 707, 709, 711, 714, - 716, 722, 727, 731, 734, 736, 743, 747, 750, 754, - 756, 758, 760, 762 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int16 yyrhs[] = -{ - 200, 0, -1, 201, -1, 201, 202, 183, -1, 202, - 183, -1, 1, 183, -1, -1, 203, -1, 216, -1, - 218, -1, 219, -1, 228, -1, 236, -1, 223, -1, - 245, -1, 250, -1, 254, -1, 259, -1, 263, -1, - 290, -1, 204, 205, 208, -1, 146, -1, 131, -1, - 126, -1, 14, -1, 84, -1, 206, -1, 207, 158, - -1, 158, -1, 66, -1, 68, -1, -1, 208, 209, - -1, 210, -1, 212, -1, 214, -1, 211, -1, 9, - -1, 17, -1, 53, -1, 116, -1, 133, -1, 134, - -1, 169, -1, 180, -1, 213, 61, -1, 213, 173, - -1, 70, -1, 100, -1, 92, -1, 171, -1, 102, - -1, 176, -1, 215, 158, -1, 54, -1, 217, 205, - -1, 174, -1, 175, -1, 15, -1, 85, 287, -1, - 107, 287, -1, 93, 61, -1, 10, 61, -1, 22, - 61, -1, 23, 220, -1, 71, 158, -1, 72, 158, - -1, 140, 61, -1, 143, 61, -1, 170, 283, -1, - 122, 158, -1, -1, 220, 221, -1, 222, 158, -1, - 143, 61, -1, 51, -1, 54, -1, 136, -1, 137, - -1, 28, -1, 167, 224, -1, 224, 225, -1, 225, - -1, 226, 61, -1, 227, 289, -1, 21, 288, -1, - 19, -1, 48, -1, 123, -1, 124, -1, 101, -1, - 13, -1, 98, -1, 90, -1, 96, -1, 88, -1, - 150, 229, -1, 152, 158, -1, 41, 230, 231, -1, - 229, 230, -1, 230, -1, 20, -1, 24, -1, 82, - -1, 127, -1, 138, -1, 160, -1, 165, -1, 135, - -1, -1, 231, 232, -1, 40, 158, -1, 172, 235, - -1, 233, -1, 234, -1, 78, -1, 109, -1, 37, - -1, 29, -1, 112, -1, 129, -1, 26, -1, 178, - -1, 105, -1, 181, -1, 4, -1, 30, 239, -1, - 106, 242, -1, 142, 205, 237, -1, 142, 206, 86, - 206, 237, -1, 142, 27, 237, -1, 142, 66, 27, - 237, -1, 142, 68, 27, 237, -1, 142, 148, 237, - -1, -1, 237, 238, -1, 47, -1, 55, -1, 73, - -1, 74, -1, 77, -1, 83, -1, 110, -1, 111, - -1, 114, -1, 115, -1, 117, -1, 118, -1, 119, - -1, 121, -1, 176, -1, 239, 240, -1, 240, -1, - 241, 61, -1, 11, -1, 99, -1, 104, -1, 242, - 243, -1, 243, -1, 244, 61, -1, 56, -1, 57, - -1, 58, -1, 59, -1, 87, -1, 89, -1, 91, - -1, 97, -1, 50, 205, 246, -1, 246, 247, -1, - 247, -1, 248, 289, -1, 249, 288, -1, 157, 61, - -1, 3, 158, -1, 139, 158, -1, 162, -1, 163, - -1, 43, -1, 44, -1, 45, -1, 46, -1, 144, - 251, -1, 251, 252, -1, 252, -1, 253, 61, -1, - 95, -1, 149, -1, 42, -1, 37, 255, -1, 29, - 255, -1, 255, 256, -1, 256, -1, 257, -1, 258, - -1, 8, -1, 12, -1, 18, -1, 69, -1, 104, - -1, 120, -1, 103, -1, 151, -1, 166, 260, -1, - 260, 261, -1, 261, -1, 262, 289, -1, 6, -1, - 31, -1, 49, -1, 52, -1, 125, -1, 153, -1, - 154, -1, 155, -1, 156, -1, 161, -1, 275, -1, - 279, -1, 264, 289, -1, 265, 61, -1, 266, 158, - -1, 267, 158, -1, 60, 158, 202, -1, 38, -1, - 33, 268, -1, 80, 273, -1, 128, 286, -1, 147, - 269, -1, 168, 206, 271, -1, 171, 282, -1, 16, - -1, 113, -1, 161, -1, 35, -1, 76, -1, 54, - -1, 75, -1, 130, -1, 81, -1, 145, -1, 158, - -1, 158, 32, -1, -1, 158, 194, 158, 270, -1, - 27, -1, -1, -1, 271, 272, -1, 132, 61, -1, - 62, 206, -1, 273, 274, -1, 274, -1, 158, -1, - 276, 278, 277, -1, 276, 278, 158, -1, 62, -1, - 108, -1, 5, -1, 65, -1, 67, -1, 179, -1, - 79, -1, 55, -1, 34, -1, 141, 280, -1, 280, - 281, -1, 281, -1, 7, -1, 8, -1, 25, -1, - 64, -1, 94, -1, 159, -1, 164, -1, 282, 61, - -1, 61, -1, 283, 284, -1, 284, -1, 61, -1, - 285, -1, 195, 61, 36, 61, 196, -1, 286, 158, - -1, 158, -1, 287, 205, -1, 205, -1, 61, -1, - 169, -1, 39, -1, 61, -1, 32, -1, 291, 197, - 292, 295, 198, -1, 184, -1, 292, 293, 183, -1, - 293, 183, -1, 294, 194, 289, -1, 185, -1, 186, - -1, 295, 296, -1, 296, -1, 298, 197, 297, 299, - 198, -1, 187, 194, 289, 183, -1, 146, 194, 205, - -1, 299, 300, -1, 300, -1, 188, 194, 289, 197, - 301, 198, -1, 301, 302, 183, -1, 302, 183, -1, - 303, 194, 289, -1, 189, -1, 190, -1, 191, -1, - 192, -1, 193, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { 0, 366, 366, 370, 371, 372, 387, 388, 389, 390, @@ -1019,15 +895,15 @@ static const yytype_uint16 yyrline[] = 1073, 1077, 1078, 1086, 1091, 1096, 1104, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1127, 1128, 1129, 1136, 1143, 1150, 1166, 1185, 1187, 1189, 1191, 1193, 1195, - 1202, 1207, 1208, 1209, 1213, 1217, 1226, 1227, 1228, 1232, - 1233, 1237, 1244, 1254, 1263, 1268, 1270, 1275, 1276, 1284, - 1286, 1294, 1299, 1307, 1332, 1339, 1349, 1350, 1354, 1355, - 1356, 1357, 1361, 1362, 1363, 1367, 1372, 1377, 1385, 1386, - 1387, 1388, 1389, 1390, 1391, 1401, 1406, 1414, 1419, 1427, - 1429, 1433, 1438, 1443, 1451, 1456, 1464, 1473, 1474, 1478, - 1479, 1488, 1506, 1510, 1515, 1523, 1528, 1529, 1533, 1538, - 1546, 1551, 1556, 1561, 1566, 1574, 1579, 1584, 1592, 1597, - 1598, 1599, 1600, 1601 + 1202, 1207, 1208, 1209, 1213, 1217, 1226, 1227, 1231, 1232, + 1233, 1237, 1248, 1262, 1274, 1279, 1281, 1286, 1287, 1295, + 1297, 1305, 1310, 1318, 1343, 1350, 1360, 1361, 1365, 1366, + 1367, 1368, 1372, 1373, 1374, 1378, 1383, 1388, 1396, 1397, + 1398, 1399, 1400, 1401, 1402, 1412, 1417, 1425, 1430, 1438, + 1440, 1444, 1449, 1454, 1462, 1467, 1475, 1484, 1485, 1489, + 1490, 1499, 1517, 1521, 1526, 1534, 1539, 1540, 1544, 1549, + 1557, 1562, 1567, 1572, 1577, 1585, 1590, 1595, 1603, 1608, + 1609, 1610, 1611, 1612 }; #endif @@ -1105,13 +981,13 @@ static const char *const yytname[] = "sim_init_statement_list", "sim_init_statement", "sim_init_keyword", "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", - "sim_act_keyword", YY_NULL + "sim_act_keyword", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -1137,148 +1013,18 @@ static const yytype_uint16 yytoknum[] = }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint16 yyr1[] = -{ - 0, 199, 200, 201, 201, 201, 202, 202, 202, 202, - 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, - 203, 204, 204, 204, 204, 204, 205, 205, 206, 207, - 207, 208, 208, 209, 209, 209, 210, 211, 211, 211, - 211, 211, 211, 211, 211, 212, 212, 213, 213, 213, - 213, 213, 213, 214, 215, 216, 217, 217, 218, 218, - 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, - 219, 220, 220, 221, 221, 222, 222, 222, 222, 222, - 223, 224, 224, 225, 225, 225, 226, 226, 226, 226, - 226, 226, 227, 227, 227, 227, 228, 228, 228, 229, - 229, 230, 230, 230, 230, 230, 230, 230, 230, 231, - 231, 232, 232, 232, 232, 233, 233, 234, 234, 235, - 235, 235, 235, 235, 235, 235, 236, 236, 236, 236, - 236, 236, 236, 236, 237, 237, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 238, 239, 239, 240, 241, 241, 241, 242, 242, 243, - 244, 244, 244, 244, 244, 244, 244, 244, 245, 246, - 246, 247, 247, 247, 247, 247, 248, 248, 249, 249, - 249, 249, 250, 251, 251, 252, 253, 253, 253, 254, - 254, 255, 255, 256, 256, 257, 257, 257, 257, 257, - 257, 258, 258, 259, 260, 260, 261, 262, 262, 262, - 262, 262, 262, 262, 262, 262, 262, 263, 263, 263, - 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - 263, 264, 264, 264, 265, 265, 266, 266, 266, 267, - 267, 268, 268, 268, 269, 270, 270, 271, 271, 272, - 272, 273, 273, 274, 275, 275, 276, 276, 277, 277, - 277, 277, 278, 278, 278, 279, 280, 280, 281, 281, - 281, 281, 281, 281, 281, 282, 282, 283, 283, 284, - 284, 285, 286, 286, 287, 287, 288, 288, 288, 289, - 289, 290, 291, 292, 292, 293, 294, 294, 295, 295, - 296, 297, 298, 299, 299, 300, 301, 301, 302, 303, - 303, 303, 303, 303 -}; +#define YYPACT_NINF -185 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 3, 2, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 1, 1, 1, 1, 1, 1, 2, 1, 1, - 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, - 1, 1, 1, 2, 1, 2, 1, 1, 1, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 0, 2, 2, 2, 1, 1, 1, 1, 1, - 2, 2, 1, 2, 2, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 3, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 3, 5, - 3, 4, 4, 3, 0, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 2, 1, 1, 1, 2, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, - 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, - 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 2, 2, 2, 3, 1, 2, 2, 2, 2, 3, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 0, 4, 1, 0, 0, 2, 2, - 2, 2, 1, 1, 3, 3, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, - 1, 5, 2, 1, 2, 1, 1, 1, 1, 1, - 1, 5, 1, 3, 2, 3, 1, 1, 2, 1, - 5, 4, 3, 2, 1, 6, 3, 2, 3, 1, - 1, 1, 1, 1 -}; +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-185))) -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint16 yydefact[] = -{ - 0, 0, 0, 24, 58, 231, 0, 71, 0, 0, - 243, 234, 0, 224, 0, 0, 236, 0, 256, 0, - 0, 237, 235, 0, 239, 25, 0, 0, 0, 0, - 257, 232, 0, 23, 0, 238, 22, 0, 0, 0, - 0, 0, 240, 21, 0, 0, 0, 233, 0, 0, - 0, 0, 0, 56, 57, 292, 0, 2, 0, 7, - 0, 8, 0, 9, 10, 13, 11, 12, 14, 15, - 16, 17, 18, 0, 0, 0, 0, 217, 0, 218, - 19, 0, 5, 62, 63, 64, 195, 196, 197, 198, - 201, 199, 200, 202, 190, 192, 193, 194, 154, 155, - 156, 126, 152, 0, 241, 225, 189, 101, 102, 103, - 104, 108, 105, 106, 107, 109, 29, 30, 28, 0, - 26, 0, 6, 65, 66, 253, 226, 252, 285, 59, - 61, 160, 161, 162, 163, 164, 165, 166, 167, 127, - 158, 0, 60, 70, 283, 227, 67, 268, 269, 270, - 271, 272, 273, 274, 265, 267, 134, 29, 30, 134, - 134, 26, 68, 188, 186, 187, 182, 184, 0, 0, - 228, 96, 100, 97, 207, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 203, 205, 0, 91, 86, 0, - 87, 95, 93, 94, 92, 90, 88, 89, 80, 82, - 0, 0, 247, 279, 0, 69, 278, 280, 276, 230, - 1, 0, 4, 31, 55, 290, 289, 219, 220, 221, - 222, 264, 263, 262, 0, 0, 79, 75, 76, 77, - 78, 0, 72, 0, 191, 151, 153, 242, 98, 0, - 178, 179, 180, 181, 0, 0, 176, 177, 168, 170, - 0, 0, 27, 223, 251, 284, 157, 159, 282, 266, - 130, 134, 134, 133, 128, 0, 183, 185, 0, 99, - 204, 206, 288, 286, 287, 85, 81, 83, 84, 229, - 0, 277, 275, 3, 20, 258, 259, 260, 255, 261, - 254, 296, 297, 0, 0, 0, 74, 73, 118, 117, - 0, 115, 116, 0, 110, 113, 114, 174, 175, 173, - 169, 171, 172, 136, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 149, 150, 135, 131, - 132, 134, 246, 0, 0, 248, 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, 299, 0, 294, 0, 111, 125, 121, 123, - 119, 120, 122, 124, 112, 129, 245, 244, 250, 249, - 0, 45, 46, 53, 0, 293, 291, 298, 0, 295, - 281, 302, 0, 0, 0, 0, 0, 304, 0, 0, - 300, 303, 301, 0, 0, 309, 310, 311, 312, 313, - 0, 0, 0, 305, 0, 307, 0, 306, 308 -}; +#define YYTABLE_NINF -7 -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 56, 57, 58, 59, 60, 128, 120, 121, 284, - 352, 353, 354, 355, 356, 357, 358, 61, 62, 63, - 64, 85, 232, 233, 65, 198, 199, 200, 201, 66, - 171, 115, 238, 304, 305, 306, 374, 67, 260, 328, - 101, 102, 103, 139, 140, 141, 68, 248, 249, 250, - 251, 69, 166, 167, 168, 70, 94, 95, 96, 97, - 71, 184, 185, 186, 72, 73, 74, 75, 76, 105, - 170, 377, 279, 335, 126, 127, 77, 78, 290, 224, - 79, 154, 155, 209, 205, 206, 207, 145, 129, 275, - 217, 80, 81, 293, 294, 295, 361, 362, 393, 363, - 396, 397, 410, 411, 412 -}; +#define yytable_value_is_error(Yytable_value) \ + 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -185 + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { 78, -169, -34, -185, -185, -185, -29, -185, 17, 43, @@ -1325,7 +1071,56 @@ static const yytype_int16 yypact[] = 98, 57, 47, -185, 60, -185, -12, -185, -185 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 0, 0, 0, 24, 58, 231, 0, 71, 0, 0, + 243, 234, 0, 224, 0, 0, 236, 0, 256, 0, + 0, 237, 235, 0, 238, 25, 0, 0, 0, 0, + 257, 232, 0, 23, 0, 239, 22, 0, 0, 0, + 0, 0, 240, 21, 0, 0, 0, 233, 0, 0, + 0, 0, 0, 56, 57, 292, 0, 2, 0, 7, + 0, 8, 0, 9, 10, 13, 11, 12, 14, 15, + 16, 17, 18, 0, 0, 0, 0, 217, 0, 218, + 19, 0, 5, 62, 63, 64, 195, 196, 197, 198, + 201, 199, 200, 202, 190, 192, 193, 194, 154, 155, + 156, 126, 152, 0, 241, 225, 189, 101, 102, 103, + 104, 108, 105, 106, 107, 109, 29, 30, 28, 0, + 26, 0, 6, 65, 66, 253, 226, 252, 285, 59, + 61, 160, 161, 162, 163, 164, 165, 166, 167, 127, + 158, 0, 60, 70, 283, 227, 67, 268, 269, 270, + 271, 272, 273, 274, 265, 267, 134, 29, 30, 134, + 134, 26, 68, 188, 186, 187, 182, 184, 0, 0, + 228, 96, 100, 97, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 203, 205, 0, 91, 86, 0, + 87, 95, 93, 94, 92, 90, 88, 89, 80, 82, + 0, 0, 247, 279, 0, 69, 278, 280, 276, 230, + 1, 0, 4, 31, 55, 290, 289, 219, 220, 221, + 222, 264, 263, 262, 0, 0, 79, 75, 76, 77, + 78, 0, 72, 0, 191, 151, 153, 242, 98, 0, + 178, 179, 180, 181, 0, 0, 176, 177, 168, 170, + 0, 0, 27, 223, 251, 284, 157, 159, 282, 266, + 130, 134, 134, 133, 128, 0, 183, 185, 0, 99, + 204, 206, 288, 286, 287, 85, 81, 83, 84, 229, + 0, 277, 275, 3, 20, 258, 259, 260, 255, 261, + 254, 296, 297, 0, 0, 0, 74, 73, 118, 117, + 0, 115, 116, 0, 110, 113, 114, 174, 175, 173, + 169, 171, 172, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 135, 131, + 132, 134, 246, 0, 0, 248, 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, 299, 0, 294, 0, 111, 125, 121, 123, + 119, 120, 122, 124, 112, 129, 245, 244, 250, 249, + 0, 45, 46, 53, 0, 293, 291, 298, 0, 295, + 281, 302, 0, 0, 0, 0, 0, 304, 0, 0, + 300, 303, 301, 0, 0, 309, 310, 311, 312, 313, + 0, 0, 0, 305, 0, 307, 0, 306, 308 +}; + + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -185, -185, -185, -44, -185, -185, -15, -38, -185, -185, @@ -1341,10 +1136,25 @@ static const yytype_int16 yypgoto[] = -185, -113, -185, -126, -185 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -7 + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 56, 57, 58, 59, 60, 128, 120, 121, 284, + 352, 353, 354, 355, 356, 357, 358, 61, 62, 63, + 64, 85, 232, 233, 65, 198, 199, 200, 201, 66, + 171, 115, 238, 304, 305, 306, 374, 67, 260, 328, + 101, 102, 103, 139, 140, 141, 68, 248, 249, 250, + 251, 69, 166, 167, 168, 70, 94, 95, 96, 97, + 71, 184, 185, 186, 72, 73, 74, 75, 76, 105, + 170, 377, 279, 335, 126, 127, 77, 78, 290, 224, + 79, 154, 155, 209, 205, 206, 207, 145, 129, 275, + 217, 80, 81, 293, 294, 295, 361, 362, 393, 363, + 396, 397, 410, 411, 412 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 119, 161, 271, 285, 272, 203, 381, 263, 264, 172, @@ -1414,12 +1224,6 @@ static const yytype_int16 yytable[] = 350, 0, 0, 0, 351, 0, 196, 197 }; -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-185))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - static const yytype_int16 yycheck[] = { 15, 39, 186, 5, 39, 61, 61, 159, 160, 45, @@ -1489,8 +1293,8 @@ static const yytype_int16 yycheck[] = 176, -1, -1, -1, 180, -1, 123, 124 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { 0, 1, 10, 14, 15, 16, 22, 23, 29, 30, @@ -1537,30 +1341,90 @@ static const yytype_uint16 yystos[] = 301, 302, 303, 198, 302, 183, 194, 183, 289 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* 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. 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 + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint16 yyr1[] = +{ + 0, 199, 200, 201, 201, 201, 202, 202, 202, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 203, 204, 204, 204, 204, 204, 205, 205, 206, 207, + 207, 208, 208, 209, 209, 209, 210, 211, 211, 211, + 211, 211, 211, 211, 211, 212, 212, 213, 213, 213, + 213, 213, 213, 214, 215, 216, 217, 217, 218, 218, + 218, 218, 219, 219, 219, 219, 219, 219, 219, 219, + 219, 220, 220, 221, 221, 222, 222, 222, 222, 222, + 223, 224, 224, 225, 225, 225, 226, 226, 226, 226, + 226, 226, 227, 227, 227, 227, 228, 228, 228, 229, + 229, 230, 230, 230, 230, 230, 230, 230, 230, 231, + 231, 232, 232, 232, 232, 233, 233, 234, 234, 235, + 235, 235, 235, 235, 235, 235, 236, 236, 236, 236, + 236, 236, 236, 236, 237, 237, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 239, 239, 240, 241, 241, 241, 242, 242, 243, + 244, 244, 244, 244, 244, 244, 244, 244, 245, 246, + 246, 247, 247, 247, 247, 247, 248, 248, 249, 249, + 249, 249, 250, 251, 251, 252, 253, 253, 253, 254, + 254, 255, 255, 256, 256, 257, 257, 257, 257, 257, + 257, 258, 258, 259, 260, 260, 261, 262, 262, 262, + 262, 262, 262, 262, 262, 262, 262, 263, 263, 263, + 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, + 263, 264, 264, 264, 265, 265, 266, 266, 267, 267, + 267, 268, 268, 268, 269, 270, 270, 271, 271, 272, + 272, 273, 273, 274, 275, 275, 276, 276, 277, 277, + 277, 277, 278, 278, 278, 279, 280, 280, 281, 281, + 281, 281, 281, 281, 281, 282, 282, 283, 283, 284, + 284, 285, 286, 286, 287, 287, 288, 288, 288, 289, + 289, 290, 291, 292, 292, 293, 294, 294, 295, 295, + 296, 297, 298, 299, 299, 300, 301, 301, 302, 303, + 303, 303, 303, 303 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 3, 2, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 0, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, + 1, 1, 1, 2, 1, 2, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 0, 2, 2, 2, 1, 1, 1, 1, 1, + 2, 2, 1, 2, 2, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 3, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 3, 5, + 3, 4, 4, 3, 0, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 2, 1, 1, 1, 2, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 2, + 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, + 1, 1, 2, 2, 1, 2, 1, 1, 1, 2, + 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 2, 1, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 3, 1, 2, 2, 2, 2, 3, + 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 0, 4, 1, 0, 0, 2, 2, + 2, 2, 1, 1, 3, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, + 1, 5, 2, 1, 2, 1, 1, 1, 1, 1, + 1, 5, 1, 3, 2, 3, 1, 1, 2, 1, + 5, 4, 3, 2, 1, 6, 3, 2, 3, 1, + 1, 1, 1, 1 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + #define YYRECOVERING() (!!yyerrstatus) @@ -1577,27 +1441,15 @@ do \ else \ { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) /* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +#define YYTERROR 1 +#define YYERRCODE 256 -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1607,40 +1459,36 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { FILE *yyo = yyoutput; YYUSE (yyo); @@ -1649,8 +1497,6 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif YYUSE (yytype); } @@ -1660,22 +1506,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -1686,16 +1521,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -1706,49 +1533,42 @@ yy_stack_print (yybottom, yytop) YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -1762,7 +1582,7 @@ int yydebug; /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1785,15 +1605,8 @@ int yydebug; # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -1809,16 +1622,8 @@ yystrlen (yystr) # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static char * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -1848,27 +1653,27 @@ yytnamerr (char *yyres, const char *yystr) char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -1891,11 +1696,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -1903,10 +1708,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html> - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -1956,7 +1757,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, } yyarg[yycount++] = yytname[yyx]; { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) return 2; @@ -2023,26 +1824,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -2051,18 +1843,8 @@ yydestruct (yymsg, yytype, yyvaluep) /* The lookahead symbol. */ int yychar; - -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); - +YYSTYPE yylval; /* Number of syntax errors so far. */ int yynerrs; @@ -2071,35 +1853,16 @@ int yynerrs; | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -2167,23 +1930,23 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); + + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -2191,22 +1954,22 @@ yyparse () # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -2215,10 +1978,10 @@ yyparse () yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -2247,7 +2010,7 @@ yybackup: if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (); } if (yychar <= YYEOF) @@ -2312,7 +2075,7 @@ yyreduce: yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -2326,8 +2089,7 @@ yyreduce: switch (yyn) { case 5: -/* Line 1787 of yacc.c */ -#line 373 "../../ntpd/ntp_parser.y" +#line 373 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { /* I will need to incorporate much more fine grained * error messages. The following should suffice for @@ -2340,433 +2102,433 @@ yyreduce: ip_ctx->errpos.nline, ip_ctx->errpos.ncol); } +#line 2106 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 20: -/* Line 1787 of yacc.c */ -#line 409 "../../ntpd/ntp_parser.y" +#line 409 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { peer_node *my_node; - my_node = create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); + my_node = create_peer_node((yyvsp[-2].Integer), (yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); APPEND_G_FIFO(cfgt.peers, my_node); } +#line 2117 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 27: -/* Line 1787 of yacc.c */ -#line 428 "../../ntpd/ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), (yyvsp[(1) - (2)].Integer)); } +#line 428 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = create_address_node((yyvsp[0].String), (yyvsp[-1].Integer)); } +#line 2123 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 28: -/* Line 1787 of yacc.c */ -#line 433 "../../ntpd/ntp_parser.y" - { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), AF_UNSPEC); } +#line 433 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = create_address_node((yyvsp[0].String), AF_UNSPEC); } +#line 2129 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 29: -/* Line 1787 of yacc.c */ -#line 438 "../../ntpd/ntp_parser.y" +#line 438 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Integer) = AF_INET; } +#line 2135 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 30: -/* Line 1787 of yacc.c */ -#line 440 "../../ntpd/ntp_parser.y" +#line 440 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Integer) = AF_INET6; } +#line 2141 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 31: -/* Line 1787 of yacc.c */ -#line 445 "../../ntpd/ntp_parser.y" +#line 445 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; } +#line 2147 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 32: -/* Line 1787 of yacc.c */ -#line 447 "../../ntpd/ntp_parser.y" +#line 447 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2156 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 36: -/* Line 1787 of yacc.c */ -#line 461 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } +#line 461 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2162 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 45: -/* Line 1787 of yacc.c */ -#line 477 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 477 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2168 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 46: -/* Line 1787 of yacc.c */ -#line 479 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_uval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 479 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_uval((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2174 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 53: -/* Line 1787 of yacc.c */ -#line 493 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 493 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2180 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 55: -/* Line 1787 of yacc.c */ -#line 507 "../../ntpd/ntp_parser.y" +#line 507 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { unpeer_node *my_node; - my_node = create_unpeer_node((yyvsp[(2) - (2)].Address_node)); + my_node = create_unpeer_node((yyvsp[0].Address_node)); if (my_node) APPEND_G_FIFO(cfgt.unpeers, my_node); } +#line 2192 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 58: -/* Line 1787 of yacc.c */ -#line 528 "../../ntpd/ntp_parser.y" +#line 528 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { cfgt.broadcastclient = 1; } +#line 2198 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 59: -/* Line 1787 of yacc.c */ -#line 530 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[(2) - (2)].Address_fifo)); } +#line 530 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.manycastserver, (yyvsp[0].Address_fifo)); } +#line 2204 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 60: -/* Line 1787 of yacc.c */ -#line 532 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[(2) - (2)].Address_fifo)); } +#line 532 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.multicastclient, (yyvsp[0].Address_fifo)); } +#line 2210 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 61: -/* Line 1787 of yacc.c */ -#line 534 "../../ntpd/ntp_parser.y" - { cfgt.mdnstries = (yyvsp[(2) - (2)].Integer); } +#line 534 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.mdnstries = (yyvsp[0].Integer); } +#line 2216 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 62: -/* Line 1787 of yacc.c */ -#line 545 "../../ntpd/ntp_parser.y" +#line 545 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { attr_val *atrv; - atrv = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); + atrv = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); APPEND_G_FIFO(cfgt.vars, atrv); } +#line 2227 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 63: -/* Line 1787 of yacc.c */ -#line 552 "../../ntpd/ntp_parser.y" - { cfgt.auth.control_key = (yyvsp[(2) - (2)].Integer); } +#line 552 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.control_key = (yyvsp[0].Integer); } +#line 2233 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 64: -/* Line 1787 of yacc.c */ -#line 554 "../../ntpd/ntp_parser.y" +#line 554 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { cfgt.auth.cryptosw++; - CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.auth.crypto_cmd_list, (yyvsp[0].Attr_val_fifo)); } +#line 2242 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 65: -/* Line 1787 of yacc.c */ -#line 559 "../../ntpd/ntp_parser.y" - { cfgt.auth.keys = (yyvsp[(2) - (2)].String); } +#line 559 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.keys = (yyvsp[0].String); } +#line 2248 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 66: -/* Line 1787 of yacc.c */ -#line 561 "../../ntpd/ntp_parser.y" - { cfgt.auth.keysdir = (yyvsp[(2) - (2)].String); } +#line 561 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.keysdir = (yyvsp[0].String); } +#line 2254 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 67: -/* Line 1787 of yacc.c */ -#line 563 "../../ntpd/ntp_parser.y" - { cfgt.auth.request_key = (yyvsp[(2) - (2)].Integer); } +#line 563 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.request_key = (yyvsp[0].Integer); } +#line 2260 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 68: -/* Line 1787 of yacc.c */ -#line 565 "../../ntpd/ntp_parser.y" - { cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); } +#line 565 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.revoke = (yyvsp[0].Integer); } +#line 2266 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 69: -/* Line 1787 of yacc.c */ -#line 567 "../../ntpd/ntp_parser.y" +#line 567 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - cfgt.auth.trusted_key_list = (yyvsp[(2) - (2)].Attr_val_fifo); + cfgt.auth.trusted_key_list = (yyvsp[0].Attr_val_fifo); // if (!cfgt.auth.trusted_key_list) // cfgt.auth.trusted_key_list = $2; // else // LINK_SLIST(cfgt.auth.trusted_key_list, $2, link); } +#line 2279 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 70: -/* Line 1787 of yacc.c */ -#line 576 "../../ntpd/ntp_parser.y" - { cfgt.auth.ntp_signd_socket = (yyvsp[(2) - (2)].String); } +#line 576 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { cfgt.auth.ntp_signd_socket = (yyvsp[0].String); } +#line 2285 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 71: -/* Line 1787 of yacc.c */ -#line 581 "../../ntpd/ntp_parser.y" +#line 581 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; } +#line 2291 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 72: -/* Line 1787 of yacc.c */ -#line 583 "../../ntpd/ntp_parser.y" +#line 583 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2300 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 73: -/* Line 1787 of yacc.c */ -#line 591 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 591 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2306 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 74: -/* Line 1787 of yacc.c */ -#line 593 "../../ntpd/ntp_parser.y" +#line 593 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val) = NULL; - cfgt.auth.revoke = (yyvsp[(2) - (2)].Integer); + cfgt.auth.revoke = (yyvsp[0].Integer); msyslog(LOG_WARNING, "'crypto revoke %d' is deprecated, " "please use 'revoke %d' instead.", cfgt.auth.revoke, cfgt.auth.revoke); } +#line 2319 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 80: -/* Line 1787 of yacc.c */ -#line 618 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 618 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.orphan_cmds, (yyvsp[0].Attr_val_fifo)); } +#line 2325 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 81: -/* Line 1787 of yacc.c */ -#line 623 "../../ntpd/ntp_parser.y" +#line 623 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2334 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 82: -/* Line 1787 of yacc.c */ -#line 628 "../../ntpd/ntp_parser.y" +#line 628 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2343 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 83: -/* Line 1787 of yacc.c */ -#line 636 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } +#line 636 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } +#line 2349 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 84: -/* Line 1787 of yacc.c */ -#line 638 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 638 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2355 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 85: -/* Line 1787 of yacc.c */ -#line 640 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); } +#line 640 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (double)(yyvsp[0].Integer)); } +#line 2361 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 96: -/* Line 1787 of yacc.c */ -#line 666 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[(2) - (2)].Int_fifo)); } +#line 666 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.stats_list, (yyvsp[0].Int_fifo)); } +#line 2367 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 97: -/* Line 1787 of yacc.c */ -#line 668 "../../ntpd/ntp_parser.y" +#line 668 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { if (lex_from_file()) { - cfgt.stats_dir = (yyvsp[(2) - (2)].String); + cfgt.stats_dir = (yyvsp[0].String); } else { - YYFREE((yyvsp[(2) - (2)].String)); + YYFREE((yyvsp[0].String)); yyerror("statsdir remote configuration ignored"); } } +#line 2380 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 98: -/* Line 1787 of yacc.c */ -#line 677 "../../ntpd/ntp_parser.y" +#line 677 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { filegen_node *fgn; - fgn = create_filegen_node((yyvsp[(2) - (3)].Integer), (yyvsp[(3) - (3)].Attr_val_fifo)); + fgn = create_filegen_node((yyvsp[-1].Integer), (yyvsp[0].Attr_val_fifo)); APPEND_G_FIFO(cfgt.filegen_opts, fgn); } +#line 2391 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 99: -/* Line 1787 of yacc.c */ -#line 687 "../../ntpd/ntp_parser.y" +#line 687 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); } +#line 2400 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 100: -/* Line 1787 of yacc.c */ -#line 692 "../../ntpd/ntp_parser.y" +#line 692 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Int_fifo) = NULL; - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); } +#line 2409 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 109: -/* Line 1787 of yacc.c */ -#line 711 "../../ntpd/ntp_parser.y" +#line 711 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; } +#line 2415 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 110: -/* Line 1787 of yacc.c */ -#line 713 "../../ntpd/ntp_parser.y" +#line 713 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2424 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 111: -/* Line 1787 of yacc.c */ -#line 721 "../../ntpd/ntp_parser.y" +#line 721 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { if (lex_from_file()) { - (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); + (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } else { (yyval.Attr_val) = NULL; - YYFREE((yyvsp[(2) - (2)].String)); + YYFREE((yyvsp[0].String)); yyerror("filegen file remote config ignored"); } } +#line 2438 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 112: -/* Line 1787 of yacc.c */ -#line 731 "../../ntpd/ntp_parser.y" +#line 731 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { if (lex_from_file()) { - (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); + (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } else { (yyval.Attr_val) = NULL; yyerror("filegen type remote config ignored"); } } +#line 2451 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 113: -/* Line 1787 of yacc.c */ -#line 740 "../../ntpd/ntp_parser.y" +#line 740 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { const char *err; if (lex_from_file()) { - (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } else { (yyval.Attr_val) = NULL; - if (T_Link == (yyvsp[(1) - (1)].Integer)) + if (T_Link == (yyvsp[0].Integer)) err = "filegen link remote config ignored"; else err = "filegen nolink remote config ignored"; yyerror(err); } } +#line 2470 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 114: -/* Line 1787 of yacc.c */ -#line 755 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } +#line 755 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2476 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 126: -/* Line 1787 of yacc.c */ -#line 785 "../../ntpd/ntp_parser.y" +#line 785 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.discard_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2484 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 127: -/* Line 1787 of yacc.c */ -#line 789 "../../ntpd/ntp_parser.y" +#line 789 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); + CONCAT_G_FIFOS(cfgt.mru_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2492 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 128: -/* Line 1787 of yacc.c */ -#line 793 "../../ntpd/ntp_parser.y" +#line 793 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node *rn; - rn = create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Int_fifo), + rn = create_restrict_node((yyvsp[-1].Address_node), NULL, (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2504 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 129: -/* Line 1787 of yacc.c */ -#line 801 "../../ntpd/ntp_parser.y" +#line 801 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node *rn; - rn = create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Int_fifo), + rn = create_restrict_node((yyvsp[-3].Address_node), (yyvsp[-1].Address_node), (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2516 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 130: -/* Line 1787 of yacc.c */ -#line 809 "../../ntpd/ntp_parser.y" +#line 809 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node *rn; - rn = create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Int_fifo), + rn = create_restrict_node(NULL, NULL, (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2528 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 131: -/* Line 1787 of yacc.c */ -#line 817 "../../ntpd/ntp_parser.y" +#line 817 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node *rn; @@ -2777,15 +2539,15 @@ yyreduce: create_address_node( estrdup("0.0.0.0"), AF_INET), - (yyvsp[(4) - (4)].Int_fifo), + (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2547 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 132: -/* Line 1787 of yacc.c */ -#line 832 "../../ntpd/ntp_parser.y" +#line 832 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node *rn; @@ -2796,320 +2558,320 @@ yyreduce: create_address_node( estrdup("::"), AF_INET6), - (yyvsp[(4) - (4)].Int_fifo), + (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2566 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 133: -/* Line 1787 of yacc.c */ -#line 847 "../../ntpd/ntp_parser.y" +#line 847 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { restrict_node * rn; - APPEND_G_FIFO((yyvsp[(3) - (3)].Int_fifo), create_int_node((yyvsp[(2) - (3)].Integer))); + APPEND_G_FIFO((yyvsp[0].Int_fifo), create_int_node((yyvsp[-1].Integer))); rn = create_restrict_node( - NULL, NULL, (yyvsp[(3) - (3)].Int_fifo), lex_current()->curpos.nline); + NULL, NULL, (yyvsp[0].Int_fifo), lex_current()->curpos.nline); APPEND_G_FIFO(cfgt.restrict_opts, rn); } +#line 2579 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 134: -/* Line 1787 of yacc.c */ -#line 859 "../../ntpd/ntp_parser.y" +#line 859 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Int_fifo) = NULL; } +#line 2585 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 135: -/* Line 1787 of yacc.c */ -#line 861 "../../ntpd/ntp_parser.y" +#line 861 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); } +#line 2594 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 151: -/* Line 1787 of yacc.c */ -#line 887 "../../ntpd/ntp_parser.y" +#line 887 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2603 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 152: -/* Line 1787 of yacc.c */ -#line 892 "../../ntpd/ntp_parser.y" +#line 892 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2612 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 153: -/* Line 1787 of yacc.c */ -#line 900 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 900 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2618 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 157: -/* Line 1787 of yacc.c */ -#line 911 "../../ntpd/ntp_parser.y" +#line 911 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2627 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 158: -/* Line 1787 of yacc.c */ -#line 916 "../../ntpd/ntp_parser.y" +#line 916 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2636 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 159: -/* Line 1787 of yacc.c */ -#line 924 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 924 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2642 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 168: -/* Line 1787 of yacc.c */ -#line 944 "../../ntpd/ntp_parser.y" +#line 944 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { addr_opts_node *aon; - aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); + aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); APPEND_G_FIFO(cfgt.fudge, aon); } +#line 2653 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 169: -/* Line 1787 of yacc.c */ -#line 954 "../../ntpd/ntp_parser.y" +#line 954 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2662 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 170: -/* Line 1787 of yacc.c */ -#line 959 "../../ntpd/ntp_parser.y" +#line 959 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2671 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 171: -/* Line 1787 of yacc.c */ -#line 967 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 967 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2677 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 172: -/* Line 1787 of yacc.c */ -#line 969 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 969 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2683 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 173: -/* Line 1787 of yacc.c */ -#line 971 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 971 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2689 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 174: -/* Line 1787 of yacc.c */ -#line 973 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 973 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2695 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 175: -/* Line 1787 of yacc.c */ -#line 975 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); } +#line 975 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); } +#line 2701 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 182: -/* Line 1787 of yacc.c */ -#line 996 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 996 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.rlimit, (yyvsp[0].Attr_val_fifo)); } +#line 2707 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 183: -/* Line 1787 of yacc.c */ -#line 1001 "../../ntpd/ntp_parser.y" +#line 1001 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2716 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 184: -/* Line 1787 of yacc.c */ -#line 1006 "../../ntpd/ntp_parser.y" +#line 1006 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2725 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 185: -/* Line 1787 of yacc.c */ -#line 1014 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 1014 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 2731 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 189: -/* Line 1787 of yacc.c */ -#line 1030 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 1030 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.enable_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2737 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 190: -/* Line 1787 of yacc.c */ -#line 1032 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 1032 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.disable_opts, (yyvsp[0].Attr_val_fifo)); } +#line 2743 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 191: -/* Line 1787 of yacc.c */ -#line 1037 "../../ntpd/ntp_parser.y" +#line 1037 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2752 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 192: -/* Line 1787 of yacc.c */ -#line 1042 "../../ntpd/ntp_parser.y" +#line 1042 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2761 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 193: -/* Line 1787 of yacc.c */ -#line 1050 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); } +#line 1050 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } +#line 2767 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 194: -/* Line 1787 of yacc.c */ -#line 1052 "../../ntpd/ntp_parser.y" +#line 1052 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { if (lex_from_file()) { - (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[(1) - (1)].Integer)); + (yyval.Attr_val) = create_attr_ival(T_Flag, (yyvsp[0].Integer)); } else { char err_str[128]; (yyval.Attr_val) = NULL; snprintf(err_str, sizeof(err_str), "enable/disable %s remote configuration ignored", - keyword((yyvsp[(1) - (1)].Integer))); + keyword((yyvsp[0].Integer))); yyerror(err_str); } } +#line 2785 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 203: -/* Line 1787 of yacc.c */ -#line 1087 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 1087 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.tinker, (yyvsp[0].Attr_val_fifo)); } +#line 2791 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 204: -/* Line 1787 of yacc.c */ -#line 1092 "../../ntpd/ntp_parser.y" +#line 1092 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2800 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 205: -/* Line 1787 of yacc.c */ -#line 1097 "../../ntpd/ntp_parser.y" +#line 1097 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 2809 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 206: -/* Line 1787 of yacc.c */ -#line 1105 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); } +#line 1105 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); } +#line 2815 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 219: -/* Line 1787 of yacc.c */ -#line 1130 "../../ntpd/ntp_parser.y" +#line 1130 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { attr_val *av; - av = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); + av = create_attr_dval((yyvsp[-1].Integer), (yyvsp[0].Double)); APPEND_G_FIFO(cfgt.vars, av); } +#line 2826 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 220: -/* Line 1787 of yacc.c */ -#line 1137 "../../ntpd/ntp_parser.y" +#line 1137 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { attr_val *av; - av = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); + av = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); APPEND_G_FIFO(cfgt.vars, av); } +#line 2837 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 221: -/* Line 1787 of yacc.c */ -#line 1144 "../../ntpd/ntp_parser.y" +#line 1144 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { attr_val *av; - av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); + av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); APPEND_G_FIFO(cfgt.vars, av); } +#line 2848 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 222: -/* Line 1787 of yacc.c */ -#line 1151 "../../ntpd/ntp_parser.y" +#line 1151 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { char error_text[64]; attr_val *av; if (lex_from_file()) { - av = create_attr_sval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].String)); + av = create_attr_sval((yyvsp[-1].Integer), (yyvsp[0].String)); APPEND_G_FIFO(cfgt.vars, av); } else { - YYFREE((yyvsp[(2) - (2)].String)); + YYFREE((yyvsp[0].String)); snprintf(error_text, sizeof(error_text), "%s remote config ignored", - keyword((yyvsp[(1) - (2)].Integer))); + keyword((yyvsp[-1].Integer))); yyerror(error_text); } } +#line 2868 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 223: -/* Line 1787 of yacc.c */ -#line 1167 "../../ntpd/ntp_parser.y" +#line 1167 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { if (!lex_from_file()) { - YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */ + YYFREE((yyvsp[-1].String)); /* avoid leak */ yyerror("remote includefile ignored"); break; } @@ -3117,486 +2879,497 @@ yyreduce: fprintf(stderr, "getconfig: Maximum include file level exceeded.\n"); msyslog(LOG_ERR, "getconfig: Maximum include file level exceeded."); } else { - const char * path = FindConfig((yyvsp[(2) - (3)].String)); /* might return $2! */ + const char * path = FindConfig((yyvsp[-1].String)); /* might return $2! */ if (!lex_push_file(path, "r")) { fprintf(stderr, "getconfig: Couldn't open <%s>\n", path); msyslog(LOG_ERR, "getconfig: Couldn't open <%s>", path); } } - YYFREE((yyvsp[(2) - (3)].String)); /* avoid leak */ + YYFREE((yyvsp[-1].String)); /* avoid leak */ } +#line 2891 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 224: -/* Line 1787 of yacc.c */ -#line 1186 "../../ntpd/ntp_parser.y" +#line 1186 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { lex_flush_stack(); } +#line 2897 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 225: -/* Line 1787 of yacc.c */ -#line 1188 "../../ntpd/ntp_parser.y" +#line 1188 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { /* see drift_parm below for actions */ } +#line 2903 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 226: -/* Line 1787 of yacc.c */ -#line 1190 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 1190 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.logconfig, (yyvsp[0].Attr_val_fifo)); } +#line 2909 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 227: -/* Line 1787 of yacc.c */ -#line 1192 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[(2) - (2)].String_fifo)); } +#line 1192 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.phone, (yyvsp[0].String_fifo)); } +#line 2915 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 228: -/* Line 1787 of yacc.c */ -#line 1194 "../../ntpd/ntp_parser.y" - { APPEND_G_FIFO(cfgt.setvar, (yyvsp[(2) - (2)].Set_var)); } +#line 1194 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { APPEND_G_FIFO(cfgt.setvar, (yyvsp[0].Set_var)); } +#line 2921 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 229: -/* Line 1787 of yacc.c */ -#line 1196 "../../ntpd/ntp_parser.y" +#line 1196 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { addr_opts_node *aon; - aon = create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Attr_val_fifo)); + aon = create_addr_opts_node((yyvsp[-1].Address_node), (yyvsp[0].Attr_val_fifo)); APPEND_G_FIFO(cfgt.trap, aon); } +#line 2932 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 230: -/* Line 1787 of yacc.c */ -#line 1203 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[(2) - (2)].Attr_val_fifo)); } +#line 1203 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.ttl, (yyvsp[0].Attr_val_fifo)); } +#line 2938 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 235: -/* Line 1787 of yacc.c */ -#line 1218 "../../ntpd/ntp_parser.y" +#line 1218 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { #ifndef LEAP_SMEAR yyerror("Built without LEAP_SMEAR support."); #endif } +#line 2948 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 241: -/* Line 1787 of yacc.c */ -#line 1238 "../../ntpd/ntp_parser.y" +#line 1238 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - attr_val *av; - - av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String)); - APPEND_G_FIFO(cfgt.vars, av); + if (lex_from_file()) { + attr_val *av; + av = create_attr_sval(T_Driftfile, (yyvsp[0].String)); + APPEND_G_FIFO(cfgt.vars, av); + } else { + YYFREE((yyvsp[0].String)); + yyerror("driftfile remote configuration ignored"); + } } +#line 2963 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 242: -/* Line 1787 of yacc.c */ -#line 1245 "../../ntpd/ntp_parser.y" +#line 1249 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - attr_val *av; - - av = create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String)); - APPEND_G_FIFO(cfgt.vars, av); - av = create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double)); - APPEND_G_FIFO(cfgt.vars, av); + if (lex_from_file()) { + attr_val *av; + av = create_attr_sval(T_Driftfile, (yyvsp[-1].String)); + APPEND_G_FIFO(cfgt.vars, av); + av = create_attr_dval(T_WanderThreshold, (yyvsp[0].Double)); + APPEND_G_FIFO(cfgt.vars, av); + } else { + YYFREE((yyvsp[-1].String)); + yyerror("driftfile remote configuration ignored"); + } } +#line 2980 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 243: -/* Line 1787 of yacc.c */ -#line 1254 "../../ntpd/ntp_parser.y" +#line 1262 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - attr_val *av; - - av = create_attr_sval(T_Driftfile, ""); - APPEND_G_FIFO(cfgt.vars, av); + if (lex_from_file()) { + attr_val *av; + av = create_attr_sval(T_Driftfile, estrdup("")); + APPEND_G_FIFO(cfgt.vars, av); + } else { + yyerror("driftfile remote configuration ignored"); + } } +#line 2994 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 244: -/* Line 1787 of yacc.c */ -#line 1264 "../../ntpd/ntp_parser.y" - { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), (yyvsp[(4) - (4)].Integer)); } +#line 1275 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Set_var) = create_setvar_node((yyvsp[-3].String), (yyvsp[-1].String), (yyvsp[0].Integer)); } +#line 3000 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 246: -/* Line 1787 of yacc.c */ -#line 1270 "../../ntpd/ntp_parser.y" +#line 1281 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Integer) = 0; } +#line 3006 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 247: -/* Line 1787 of yacc.c */ -#line 1275 "../../ntpd/ntp_parser.y" +#line 1286 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; } +#line 3012 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 248: -/* Line 1787 of yacc.c */ -#line 1277 "../../ntpd/ntp_parser.y" +#line 1288 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 3021 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 249: -/* Line 1787 of yacc.c */ -#line 1285 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); } +#line 1296 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival((yyvsp[-1].Integer), (yyvsp[0].Integer)); } +#line 3027 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 250: -/* Line 1787 of yacc.c */ -#line 1287 "../../ntpd/ntp_parser.y" +#line 1298 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val) = create_attr_sval((yyvsp[(1) - (2)].Integer), estrdup((yyvsp[(2) - (2)].Address_node)->address)); - destroy_address_node((yyvsp[(2) - (2)].Address_node)); + (yyval.Attr_val) = create_attr_sval((yyvsp[-1].Integer), estrdup((yyvsp[0].Address_node)->address)); + destroy_address_node((yyvsp[0].Address_node)); } +#line 3036 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 251: -/* Line 1787 of yacc.c */ -#line 1295 "../../ntpd/ntp_parser.y" +#line 1306 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 3045 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 252: -/* Line 1787 of yacc.c */ -#line 1300 "../../ntpd/ntp_parser.y" +#line 1311 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 3054 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 253: -/* Line 1787 of yacc.c */ -#line 1308 "../../ntpd/ntp_parser.y" +#line 1319 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { char prefix; char * type; - switch ((yyvsp[(1) - (1)].String)[0]) { + switch ((yyvsp[0].String)[0]) { case '+': case '-': case '=': - prefix = (yyvsp[(1) - (1)].String)[0]; - type = (yyvsp[(1) - (1)].String) + 1; + prefix = (yyvsp[0].String)[0]; + type = (yyvsp[0].String) + 1; break; default: prefix = '='; - type = (yyvsp[(1) - (1)].String); + type = (yyvsp[0].String); } (yyval.Attr_val) = create_attr_sval(prefix, estrdup(type)); - YYFREE((yyvsp[(1) - (1)].String)); + YYFREE((yyvsp[0].String)); } +#line 3080 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 254: -/* Line 1787 of yacc.c */ -#line 1333 "../../ntpd/ntp_parser.y" +#line 1344 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { nic_rule_node *nrn; - nrn = create_nic_rule_node((yyvsp[(3) - (3)].Integer), NULL, (yyvsp[(2) - (3)].Integer)); + nrn = create_nic_rule_node((yyvsp[0].Integer), NULL, (yyvsp[-1].Integer)); APPEND_G_FIFO(cfgt.nic_rules, nrn); } +#line 3091 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 255: -/* Line 1787 of yacc.c */ -#line 1340 "../../ntpd/ntp_parser.y" +#line 1351 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { nic_rule_node *nrn; - nrn = create_nic_rule_node(0, (yyvsp[(3) - (3)].String), (yyvsp[(2) - (3)].Integer)); + nrn = create_nic_rule_node(0, (yyvsp[0].String), (yyvsp[-1].Integer)); APPEND_G_FIFO(cfgt.nic_rules, nrn); } +#line 3102 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 265: -/* Line 1787 of yacc.c */ -#line 1368 "../../ntpd/ntp_parser.y" - { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[(2) - (2)].Int_fifo)); } +#line 1379 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { CONCAT_G_FIFOS(cfgt.reset_counters, (yyvsp[0].Int_fifo)); } +#line 3108 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 266: -/* Line 1787 of yacc.c */ -#line 1373 "../../ntpd/ntp_parser.y" +#line 1384 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Int_fifo) = (yyvsp[(1) - (2)].Int_fifo); - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); + (yyval.Int_fifo) = (yyvsp[-1].Int_fifo); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); } +#line 3117 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 267: -/* Line 1787 of yacc.c */ -#line 1378 "../../ntpd/ntp_parser.y" +#line 1389 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Int_fifo) = NULL; - APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); + APPEND_G_FIFO((yyval.Int_fifo), create_int_node((yyvsp[0].Integer))); } +#line 3126 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 275: -/* Line 1787 of yacc.c */ -#line 1402 "../../ntpd/ntp_parser.y" +#line 1413 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(2) - (2)].Integer))); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); } +#line 3135 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 276: -/* Line 1787 of yacc.c */ -#line 1407 "../../ntpd/ntp_parser.y" +#line 1418 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[(1) - (1)].Integer))); + APPEND_G_FIFO((yyval.Attr_val_fifo), create_int_node((yyvsp[0].Integer))); } +#line 3144 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 277: -/* Line 1787 of yacc.c */ -#line 1415 "../../ntpd/ntp_parser.y" +#line 1426 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (2)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (2)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-1].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 3153 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 278: -/* Line 1787 of yacc.c */ -#line 1420 "../../ntpd/ntp_parser.y" +#line 1431 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (1)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[0].Attr_val)); } +#line 3162 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 279: -/* Line 1787 of yacc.c */ -#line 1428 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[(1) - (1)].Integer)); } +#line 1439 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_ival('i', (yyvsp[0].Integer)); } +#line 3168 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 281: -/* Line 1787 of yacc.c */ -#line 1434 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[(2) - (5)].Integer), (yyvsp[(4) - (5)].Integer)); } +#line 1445 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_rangeval('-', (yyvsp[-3].Integer), (yyvsp[-1].Integer)); } +#line 3174 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 282: -/* Line 1787 of yacc.c */ -#line 1439 "../../ntpd/ntp_parser.y" +#line 1450 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.String_fifo) = (yyvsp[(1) - (2)].String_fifo); - APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(2) - (2)].String))); + (yyval.String_fifo) = (yyvsp[-1].String_fifo); + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); } +#line 3183 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 283: -/* Line 1787 of yacc.c */ -#line 1444 "../../ntpd/ntp_parser.y" +#line 1455 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.String_fifo) = NULL; - APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[(1) - (1)].String))); + APPEND_G_FIFO((yyval.String_fifo), create_string_node((yyvsp[0].String))); } +#line 3192 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 284: -/* Line 1787 of yacc.c */ -#line 1452 "../../ntpd/ntp_parser.y" +#line 1463 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Address_fifo) = (yyvsp[(1) - (2)].Address_fifo); - APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(2) - (2)].Address_node)); + (yyval.Address_fifo) = (yyvsp[-1].Address_fifo); + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); } +#line 3201 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 285: -/* Line 1787 of yacc.c */ -#line 1457 "../../ntpd/ntp_parser.y" +#line 1468 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Address_fifo) = NULL; - APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[(1) - (1)].Address_node)); + APPEND_G_FIFO((yyval.Address_fifo), (yyvsp[0].Address_node)); } +#line 3210 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 286: -/* Line 1787 of yacc.c */ -#line 1465 "../../ntpd/ntp_parser.y" +#line 1476 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) { + if ((yyvsp[0].Integer) != 0 && (yyvsp[0].Integer) != 1) { yyerror("Integer value is not boolean (0 or 1). Assuming 1"); (yyval.Integer) = 1; } else { - (yyval.Integer) = (yyvsp[(1) - (1)].Integer); + (yyval.Integer) = (yyvsp[0].Integer); } } +#line 3223 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 287: -/* Line 1787 of yacc.c */ -#line 1473 "../../ntpd/ntp_parser.y" +#line 1484 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Integer) = 1; } +#line 3229 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 288: -/* Line 1787 of yacc.c */ -#line 1474 "../../ntpd/ntp_parser.y" +#line 1485 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Integer) = 0; } +#line 3235 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 289: -/* Line 1787 of yacc.c */ -#line 1478 "../../ntpd/ntp_parser.y" - { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); } +#line 1489 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Double) = (double)(yyvsp[0].Integer); } +#line 3241 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 291: -/* Line 1787 of yacc.c */ -#line 1489 "../../ntpd/ntp_parser.y" +#line 1500 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { sim_node *sn; - sn = create_sim_node((yyvsp[(3) - (5)].Attr_val_fifo), (yyvsp[(4) - (5)].Sim_server_fifo)); + sn = create_sim_node((yyvsp[-2].Attr_val_fifo), (yyvsp[-1].Sim_server_fifo)); APPEND_G_FIFO(cfgt.sim_details, sn); /* Revert from ; to \n for end-of-command */ old_config_style = 1; } +#line 3255 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 292: -/* Line 1787 of yacc.c */ -#line 1506 "../../ntpd/ntp_parser.y" +#line 1517 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { old_config_style = 0; } +#line 3261 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 293: -/* Line 1787 of yacc.c */ -#line 1511 "../../ntpd/ntp_parser.y" +#line 1522 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); } +#line 3270 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 294: -/* Line 1787 of yacc.c */ -#line 1516 "../../ntpd/ntp_parser.y" +#line 1527 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); } +#line 3279 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 295: -/* Line 1787 of yacc.c */ -#line 1524 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1535 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } +#line 3285 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 298: -/* Line 1787 of yacc.c */ -#line 1534 "../../ntpd/ntp_parser.y" +#line 1545 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Sim_server_fifo) = (yyvsp[(1) - (2)].Sim_server_fifo); - APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(2) - (2)].Sim_server)); + (yyval.Sim_server_fifo) = (yyvsp[-1].Sim_server_fifo); + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); } +#line 3294 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 299: -/* Line 1787 of yacc.c */ -#line 1539 "../../ntpd/ntp_parser.y" +#line 1550 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Sim_server_fifo) = NULL; - APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[(1) - (1)].Sim_server)); + APPEND_G_FIFO((yyval.Sim_server_fifo), (yyvsp[0].Sim_server)); } +#line 3303 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 300: -/* Line 1787 of yacc.c */ -#line 1547 "../../ntpd/ntp_parser.y" - { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Sim_script_fifo))); } +#line 1558 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Sim_server) = ONLY_SIM(create_sim_server((yyvsp[-4].Address_node), (yyvsp[-2].Double), (yyvsp[-1].Sim_script_fifo))); } +#line 3309 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 301: -/* Line 1787 of yacc.c */ -#line 1552 "../../ntpd/ntp_parser.y" - { (yyval.Double) = (yyvsp[(3) - (4)].Double); } +#line 1563 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Double) = (yyvsp[-1].Double); } +#line 3315 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 302: -/* Line 1787 of yacc.c */ -#line 1557 "../../ntpd/ntp_parser.y" - { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); } +#line 1568 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Address_node) = (yyvsp[0].Address_node); } +#line 3321 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 303: -/* Line 1787 of yacc.c */ -#line 1562 "../../ntpd/ntp_parser.y" +#line 1573 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Sim_script_fifo) = (yyvsp[(1) - (2)].Sim_script_fifo); - APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(2) - (2)].Sim_script)); + (yyval.Sim_script_fifo) = (yyvsp[-1].Sim_script_fifo); + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); } +#line 3330 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 304: -/* Line 1787 of yacc.c */ -#line 1567 "../../ntpd/ntp_parser.y" +#line 1578 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Sim_script_fifo) = NULL; - APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[(1) - (1)].Sim_script)); + APPEND_G_FIFO((yyval.Sim_script_fifo), (yyvsp[0].Sim_script)); } +#line 3339 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 305: -/* Line 1787 of yacc.c */ -#line 1575 "../../ntpd/ntp_parser.y" - { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Attr_val_fifo))); } +#line 1586 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Sim_script) = ONLY_SIM(create_sim_script_info((yyvsp[-3].Double), (yyvsp[-1].Attr_val_fifo))); } +#line 3345 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 306: -/* Line 1787 of yacc.c */ -#line 1580 "../../ntpd/ntp_parser.y" +#line 1591 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { - (yyval.Attr_val_fifo) = (yyvsp[(1) - (3)].Attr_val_fifo); - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(2) - (3)].Attr_val)); + (yyval.Attr_val_fifo) = (yyvsp[-2].Attr_val_fifo); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); } +#line 3354 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 307: -/* Line 1787 of yacc.c */ -#line 1585 "../../ntpd/ntp_parser.y" +#line 1596 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ { (yyval.Attr_val_fifo) = NULL; - APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[(1) - (2)].Attr_val)); + APPEND_G_FIFO((yyval.Attr_val_fifo), (yyvsp[-1].Attr_val)); } +#line 3363 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; case 308: -/* Line 1787 of yacc.c */ -#line 1593 "../../ntpd/ntp_parser.y" - { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (3)].Integer), (yyvsp[(3) - (3)].Double)); } +#line 1604 "../../ntpd/ntp_parser.y" /* yacc.c:1646 */ + { (yyval.Attr_val) = create_attr_dval((yyvsp[-2].Integer), (yyvsp[0].Double)); } +#line 3369 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ break; -/* Line 1787 of yacc.c */ -#line 3600 "ntp_parser.c" +#line 3373 "../../ntpd/ntp_parser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3618,7 +3391,7 @@ yyreduce: *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -3633,9 +3406,9 @@ yyreduce: goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -3686,20 +3459,20 @@ yyerrlab: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -3718,7 +3491,7 @@ yyerrorlab: if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -3731,29 +3504,29 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -3804,14 +3577,14 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -3822,13 +3595,9 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - -/* Line 2050 of yacc.c */ -#line 1604 "../../ntpd/ntp_parser.y" +#line 1615 "../../ntpd/ntp_parser.y" /* yacc.c:1906 */ void diff --git a/contrib/ntp/ntpd/ntp_parser.h b/contrib/ntp/ntpd/ntp_parser.h index b474fc2..1ec7f8c 100644 --- a/contrib/ntp/ntpd/ntp_parser.h +++ b/contrib/ntp/ntpd/ntp_parser.h @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.12-4996. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2013 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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,13 +26,13 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef YY_YY_NTP_PARSER_H_INCLUDED -# define YY_YY_NTP_PARSER_H_INCLUDED -/* Enabling traces. */ +#ifndef YY_YY__NTPD_NTP_PARSER_H_INCLUDED +# define YY_YY__NTPD_NTP_PARSER_H_INCLUDED +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -40,204 +40,203 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - T_Abbrev = 258, - T_Age = 259, - T_All = 260, - T_Allan = 261, - T_Allpeers = 262, - T_Auth = 263, - T_Autokey = 264, - T_Automax = 265, - T_Average = 266, - T_Bclient = 267, - T_Beacon = 268, - T_Broadcast = 269, - T_Broadcastclient = 270, - T_Broadcastdelay = 271, - T_Burst = 272, - T_Calibrate = 273, - T_Ceiling = 274, - T_Clockstats = 275, - T_Cohort = 276, - T_ControlKey = 277, - T_Crypto = 278, - T_Cryptostats = 279, - T_Ctl = 280, - T_Day = 281, - T_Default = 282, - T_Digest = 283, - T_Disable = 284, - T_Discard = 285, - T_Dispersion = 286, - T_Double = 287, - T_Driftfile = 288, - T_Drop = 289, - T_Dscp = 290, - T_Ellipsis = 291, - T_Enable = 292, - T_End = 293, - T_False = 294, - T_File = 295, - T_Filegen = 296, - T_Filenum = 297, - T_Flag1 = 298, - T_Flag2 = 299, - T_Flag3 = 300, - T_Flag4 = 301, - T_Flake = 302, - T_Floor = 303, - T_Freq = 304, - T_Fudge = 305, - T_Host = 306, - T_Huffpuff = 307, - T_Iburst = 308, - T_Ident = 309, - T_Ignore = 310, - T_Incalloc = 311, - T_Incmem = 312, - T_Initalloc = 313, - T_Initmem = 314, - T_Includefile = 315, - T_Integer = 316, - T_Interface = 317, - T_Intrange = 318, - T_Io = 319, - T_Ipv4 = 320, - T_Ipv4_flag = 321, - T_Ipv6 = 322, - T_Ipv6_flag = 323, - T_Kernel = 324, - T_Key = 325, - T_Keys = 326, - T_Keysdir = 327, - T_Kod = 328, - T_Mssntp = 329, - T_Leapfile = 330, - T_Leapsmearinterval = 331, - T_Limited = 332, - T_Link = 333, - T_Listen = 334, - T_Logconfig = 335, - T_Logfile = 336, - T_Loopstats = 337, - T_Lowpriotrap = 338, - T_Manycastclient = 339, - T_Manycastserver = 340, - T_Mask = 341, - T_Maxage = 342, - T_Maxclock = 343, - T_Maxdepth = 344, - T_Maxdist = 345, - T_Maxmem = 346, - T_Maxpoll = 347, - T_Mdnstries = 348, - T_Mem = 349, - T_Memlock = 350, - T_Minclock = 351, - T_Mindepth = 352, - T_Mindist = 353, - T_Minimum = 354, - T_Minpoll = 355, - T_Minsane = 356, - T_Mode = 357, - T_Mode7 = 358, - T_Monitor = 359, - T_Month = 360, - T_Mru = 361, - T_Multicastclient = 362, - T_Nic = 363, - T_Nolink = 364, - T_Nomodify = 365, - T_Nomrulist = 366, - T_None = 367, - T_Nonvolatile = 368, - T_Nopeer = 369, - T_Noquery = 370, - T_Noselect = 371, - T_Noserve = 372, - T_Notrap = 373, - T_Notrust = 374, - T_Ntp = 375, - T_Ntpport = 376, - T_NtpSignDsocket = 377, - T_Orphan = 378, - T_Orphanwait = 379, - T_Panic = 380, - T_Peer = 381, - T_Peerstats = 382, - T_Phone = 383, - T_Pid = 384, - T_Pidfile = 385, - T_Pool = 386, - T_Port = 387, - T_Preempt = 388, - T_Prefer = 389, - T_Protostats = 390, - T_Pw = 391, - T_Randfile = 392, - T_Rawstats = 393, - T_Refid = 394, - T_Requestkey = 395, - T_Reset = 396, - T_Restrict = 397, - T_Revoke = 398, - T_Rlimit = 399, - T_Saveconfigdir = 400, - T_Server = 401, - T_Setvar = 402, - T_Source = 403, - T_Stacksize = 404, - T_Statistics = 405, - T_Stats = 406, - T_Statsdir = 407, - T_Step = 408, - T_Stepback = 409, - T_Stepfwd = 410, - T_Stepout = 411, - T_Stratum = 412, - T_String = 413, - T_Sys = 414, - T_Sysstats = 415, - T_Tick = 416, - T_Time1 = 417, - T_Time2 = 418, - T_Timer = 419, - T_Timingstats = 420, - T_Tinker = 421, - T_Tos = 422, - T_Trap = 423, - T_True = 424, - T_Trustedkey = 425, - T_Ttl = 426, - T_Type = 427, - T_U_int = 428, - T_Unconfig = 429, - T_Unpeer = 430, - T_Version = 431, - T_WanderThreshold = 432, - T_Week = 433, - T_Wildcard = 434, - T_Xleave = 435, - T_Year = 436, - T_Flag = 437, - T_EOC = 438, - T_Simulate = 439, - T_Beep_Delay = 440, - T_Sim_Duration = 441, - T_Server_Offset = 442, - T_Duration = 443, - T_Freq_Offset = 444, - T_Wander = 445, - T_Jitter = 446, - T_Prop_Delay = 447, - T_Proc_Delay = 448 - }; + enum yytokentype + { + T_Abbrev = 258, + T_Age = 259, + T_All = 260, + T_Allan = 261, + T_Allpeers = 262, + T_Auth = 263, + T_Autokey = 264, + T_Automax = 265, + T_Average = 266, + T_Bclient = 267, + T_Beacon = 268, + T_Broadcast = 269, + T_Broadcastclient = 270, + T_Broadcastdelay = 271, + T_Burst = 272, + T_Calibrate = 273, + T_Ceiling = 274, + T_Clockstats = 275, + T_Cohort = 276, + T_ControlKey = 277, + T_Crypto = 278, + T_Cryptostats = 279, + T_Ctl = 280, + T_Day = 281, + T_Default = 282, + T_Digest = 283, + T_Disable = 284, + T_Discard = 285, + T_Dispersion = 286, + T_Double = 287, + T_Driftfile = 288, + T_Drop = 289, + T_Dscp = 290, + T_Ellipsis = 291, + T_Enable = 292, + T_End = 293, + T_False = 294, + T_File = 295, + T_Filegen = 296, + T_Filenum = 297, + T_Flag1 = 298, + T_Flag2 = 299, + T_Flag3 = 300, + T_Flag4 = 301, + T_Flake = 302, + T_Floor = 303, + T_Freq = 304, + T_Fudge = 305, + T_Host = 306, + T_Huffpuff = 307, + T_Iburst = 308, + T_Ident = 309, + T_Ignore = 310, + T_Incalloc = 311, + T_Incmem = 312, + T_Initalloc = 313, + T_Initmem = 314, + T_Includefile = 315, + T_Integer = 316, + T_Interface = 317, + T_Intrange = 318, + T_Io = 319, + T_Ipv4 = 320, + T_Ipv4_flag = 321, + T_Ipv6 = 322, + T_Ipv6_flag = 323, + T_Kernel = 324, + T_Key = 325, + T_Keys = 326, + T_Keysdir = 327, + T_Kod = 328, + T_Mssntp = 329, + T_Leapfile = 330, + T_Leapsmearinterval = 331, + T_Limited = 332, + T_Link = 333, + T_Listen = 334, + T_Logconfig = 335, + T_Logfile = 336, + T_Loopstats = 337, + T_Lowpriotrap = 338, + T_Manycastclient = 339, + T_Manycastserver = 340, + T_Mask = 341, + T_Maxage = 342, + T_Maxclock = 343, + T_Maxdepth = 344, + T_Maxdist = 345, + T_Maxmem = 346, + T_Maxpoll = 347, + T_Mdnstries = 348, + T_Mem = 349, + T_Memlock = 350, + T_Minclock = 351, + T_Mindepth = 352, + T_Mindist = 353, + T_Minimum = 354, + T_Minpoll = 355, + T_Minsane = 356, + T_Mode = 357, + T_Mode7 = 358, + T_Monitor = 359, + T_Month = 360, + T_Mru = 361, + T_Multicastclient = 362, + T_Nic = 363, + T_Nolink = 364, + T_Nomodify = 365, + T_Nomrulist = 366, + T_None = 367, + T_Nonvolatile = 368, + T_Nopeer = 369, + T_Noquery = 370, + T_Noselect = 371, + T_Noserve = 372, + T_Notrap = 373, + T_Notrust = 374, + T_Ntp = 375, + T_Ntpport = 376, + T_NtpSignDsocket = 377, + T_Orphan = 378, + T_Orphanwait = 379, + T_Panic = 380, + T_Peer = 381, + T_Peerstats = 382, + T_Phone = 383, + T_Pid = 384, + T_Pidfile = 385, + T_Pool = 386, + T_Port = 387, + T_Preempt = 388, + T_Prefer = 389, + T_Protostats = 390, + T_Pw = 391, + T_Randfile = 392, + T_Rawstats = 393, + T_Refid = 394, + T_Requestkey = 395, + T_Reset = 396, + T_Restrict = 397, + T_Revoke = 398, + T_Rlimit = 399, + T_Saveconfigdir = 400, + T_Server = 401, + T_Setvar = 402, + T_Source = 403, + T_Stacksize = 404, + T_Statistics = 405, + T_Stats = 406, + T_Statsdir = 407, + T_Step = 408, + T_Stepback = 409, + T_Stepfwd = 410, + T_Stepout = 411, + T_Stratum = 412, + T_String = 413, + T_Sys = 414, + T_Sysstats = 415, + T_Tick = 416, + T_Time1 = 417, + T_Time2 = 418, + T_Timer = 419, + T_Timingstats = 420, + T_Tinker = 421, + T_Tos = 422, + T_Trap = 423, + T_True = 424, + T_Trustedkey = 425, + T_Ttl = 426, + T_Type = 427, + T_U_int = 428, + T_Unconfig = 429, + T_Unpeer = 430, + T_Version = 431, + T_WanderThreshold = 432, + T_Week = 433, + T_Wildcard = 434, + T_Xleave = 435, + T_Year = 436, + T_Flag = 437, + T_EOC = 438, + T_Simulate = 439, + T_Beep_Delay = 440, + T_Sim_Duration = 441, + T_Server_Offset = 442, + T_Duration = 443, + T_Freq_Offset = 444, + T_Wander = 445, + T_Jitter = 446, + T_Prop_Delay = 447, + T_Proc_Delay = 448 + }; #endif /* Tokens. */ #define T_Abbrev 258 @@ -432,13 +431,12 @@ extern int yydebug; #define T_Prop_Delay 447 #define T_Proc_Delay 448 - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE +typedef union YYSTYPE YYSTYPE; +union YYSTYPE { -/* Line 2053 of yacc.c */ -#line 51 "../../ntpd/ntp_parser.y" +#line 51 "../../ntpd/ntp_parser.y" /* yacc.c:1909 */ char * String; double Double; @@ -457,29 +455,15 @@ typedef union YYSTYPE script_info * Sim_script; script_info_fifo * Sim_script_fifo; - -/* Line 2053 of yacc.c */ -#line 463 "ntp_parser.h" -} YYSTYPE; +#line 459 "../../ntpd/ntp_parser.h" /* yacc.c:1909 */ +}; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ -#endif /* !YY_YY_NTP_PARSER_H_INCLUDED */ +#endif /* !YY_YY__NTPD_NTP_PARSER_H_INCLUDED */ diff --git a/contrib/ntp/ntpd/ntp_peer.c b/contrib/ntp/ntpd/ntp_peer.c index d42d804..cc23a38 100644 --- a/contrib/ntp/ntpd/ntp_peer.c +++ b/contrib/ntp/ntpd/ntp_peer.c @@ -718,9 +718,13 @@ refresh_all_peerinterfaces(void) /* * this is called when the interface list has changed * give all peers a chance to find a better interface + * but only if either they don't have an address already + * or if the one they have hasn't worked for a while. */ - for (p = peer_list; p != NULL; p = p->p_link) - peer_refresh_interface(p); + for (p = peer_list; p != NULL; p = p->p_link) { + if (!(p->dstadr && (p->reach & 0x3))) // Bug 2849 XOR 2043 + peer_refresh_interface(p); + } } @@ -746,6 +750,8 @@ newpeer( struct peer * peer; u_int hash; + DEBUG_REQUIRE(srcadr); + #ifdef AUTOKEY /* * If Autokey is requested but not configured, complain loudly. @@ -764,7 +770,7 @@ newpeer( /* * For now only pool associations have a hostname. */ - NTP_INSIST(NULL == hostname || (MDF_POOL & cast_flags)); + INSIST(NULL == hostname || (MDF_POOL & cast_flags)); /* * First search from the beginning for an association with given @@ -817,6 +823,7 @@ newpeer( if (peer_free_count == 0) getmorepeermem(); UNLINK_HEAD_SLIST(peer, peer_free, p_link); + INSIST(peer != NULL); peer_free_count--; peer_associations++; if (FLAG_PREEMPT & flags) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 4062406..2a15d72 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -28,8 +28,8 @@ * This macro defines the authentication state. If x is 1 authentication * is required; othewise it is optional. */ -#define AUTH(x, y) ((x) ? (y) == AUTH_OK : (y) == AUTH_OK || \ - (y) == AUTH_NONE) +#define AUTH(x, y) ((x) ? (y) == AUTH_OK \ + : (y) == AUTH_OK || (y) == AUTH_NONE) #define AUTH_NONE 0 /* authentication not required */ #define AUTH_OK 1 /* authentication OK */ @@ -37,6 +37,19 @@ #define AUTH_CRYPTO 3 /* crypto_NAK */ /* + * Set up Kiss Code values + */ + +enum kiss_codes { + NOKISS, /* No Kiss Code */ + RATEKISS, /* Rate limit Kiss Code */ + DENYKISS, /* Deny Kiss */ + RSTRKISS, /* Restricted Kiss */ + XKISS, /* Experimental Kiss */ + UNKNOWNKISS /* Unknown Kiss Code */ +}; + +/* * traffic shaping parameters */ #define NTP_IBURST 6 /* packets in iburst */ @@ -139,6 +152,7 @@ u_long sys_declined; /* declined */ u_long sys_limitrejected; /* rate exceeded */ u_long sys_kodsent; /* KoD sent */ +static int kiss_code_check(u_char hisleap, u_char hisstratum, u_char hismode, u_int32 refid); static double root_distance (struct peer *); static void clock_combine (peer_select *, int, int); static void peer_xmit (struct peer *); @@ -185,7 +199,34 @@ set_sys_leap(u_char new_sys_leap) { } } +/* + * Kiss Code check + */ +int kiss_code_check(u_char hisleap, u_char hisstratum, u_char hismode, u_int32 refid) { + if ( hismode == MODE_SERVER + && hisleap == LEAP_NOTINSYNC + && hisstratum == STRATUM_UNSPEC) { + if(memcmp(&refid,"RATE", 4) == 0) { + return (RATEKISS); + } + else if(memcmp(&refid,"DENY", 4) == 0) { + return (DENYKISS); + } + else if(memcmp(&refid,"RSTR", 4) == 0) { + return (RSTRKISS); + } + else if(memcmp(&refid,"X", 1) == 0) { + return (XKISS); + } + else { + return (UNKNOWNKISS); + } + } + else { + return (NOKISS); + } +} /* * transmit - transmit procedure called by poll timeout */ @@ -235,8 +276,8 @@ transmit( peer->unreach = 0; peer->ttl = 0; peer_xmit(peer); - } else if (sys_survivors < sys_minclock || - peer_associations < sys_maxclock) { + } else if ( sys_survivors < sys_minclock + || peer_associations < sys_maxclock) { if (peer->ttl < (u_int32)sys_ttlmax) peer->ttl++; peer_xmit(peer); @@ -260,9 +301,9 @@ transmit( */ if (peer->cast_flags & MDF_POOL) { peer->outdate = current_time; - if ((peer_associations <= 2 * sys_maxclock) && - (peer_associations < sys_maxclock || - sys_survivors < sys_minclock)) + if ( (peer_associations <= 2 * sys_maxclock) + && ( peer_associations < sys_maxclock + || sys_survivors < sys_minclock)) pool_xmit(peer); poll_update(peer, hpoll); return; @@ -297,8 +338,8 @@ transmit( peer_unfit(peer); report_event(PEVNT_UNREACH, peer, NULL); } - if ((peer->flags & FLAG_IBURST) && - peer->retry == 0) + if ( (peer->flags & FLAG_IBURST) + && peer->retry == 0) peer->retry = NTP_RETRY; } else { @@ -312,8 +353,9 @@ transmit( hpoll = sys_poll; if (!(peer->flags & FLAG_PREEMPT)) peer->unreach = 0; - if ((peer->flags & FLAG_BURST) && peer->retry == - 0 && !peer_unfit(peer)) + if ( (peer->flags & FLAG_BURST) + && peer->retry == 0 + && !peer_unfit(peer)) peer->retry = NTP_RETRY; } @@ -334,9 +376,9 @@ transmit( unpeer(peer); return; } - if ((peer->flags & FLAG_PREEMPT) && - (peer_associations > sys_maxclock) && - score_all(peer)) { + if ( (peer->flags & FLAG_PREEMPT) + && (peer_associations > sys_maxclock) + && score_all(peer)) { report_event(PEVNT_RESTART, peer, "timeout"); peer_clear(peer, "TIME"); unpeer(peer); @@ -392,6 +434,7 @@ receive( u_char hismode; /* packet mode */ u_char hisstratum; /* packet stratum */ u_short restrict_mask; /* restrict bits */ + int kissCode = NOKISS; /* Kiss Code */ int has_mac; /* length of MAC field */ int authlen; /* offset of MAC field */ int is_authentic = 0; /* cryptosum ok */ @@ -483,8 +526,8 @@ receive( */ if (hisversion == NTP_VERSION) { sys_newversion++; /* new version */ - } else if (!(restrict_mask & RES_VERSION) && hisversion >= - NTP_OLDVERSION) { + } else if ( !(restrict_mask & RES_VERSION) + && hisversion >= NTP_OLDVERSION) { sys_oldversion++; /* previous version */ } else { sys_badlength++; @@ -538,8 +581,9 @@ receive( } else { opcode = ntohl(((u_int32 *)pkt)[authlen / 4]); len = opcode & 0xffff; - if (len % 4 != 0 || len < 4 || (int)len + - authlen > rbufp->recv_length) { + if ( len % 4 != 0 + || len < 4 + || (int)len + authlen > rbufp->recv_length) { sys_badlength++; return; /* bad length */ } @@ -549,13 +593,13 @@ receive( * sys_groupname is non-NULL, there must be * a group name provided to elicit a response. */ - if ((opcode & 0x3fff0000) == CRYPTO_ASSOC && - sys_groupname != NULL) { + if ( (opcode & 0x3fff0000) == CRYPTO_ASSOC + && sys_groupname != NULL) { ep = (struct exten *)&((u_int32 *)pkt)[authlen / 4]; hostlen = ntohl(ep->vallen); - if (hostlen >= sizeof(hostname) || - hostlen > len - - offsetof(struct exten, pkt)) { + if ( hostlen >= sizeof(hostname) + || hostlen > len - + offsetof(struct exten, pkt)) { sys_badlength++; return; /* bad length */ } @@ -599,8 +643,9 @@ receive( restrict_mask = ntp_monitor(rbufp, restrict_mask); if (restrict_mask & RES_LIMITED) { sys_limitrejected++; - if (!(restrict_mask & RES_KOD) || MODE_BROADCAST == - hismode || MODE_SERVER == hismode) { + if ( !(restrict_mask & RES_KOD) + || MODE_BROADCAST == hismode + || MODE_SERVER == hismode) { if (MODE_SERVER == hismode) DPRINTF(1, ("Possibly self-induced rate limiting of MODE_SERVER from %s\n", stoa(&rbufp->recv_srcadr))); @@ -698,10 +743,11 @@ receive( * This is described in Microsoft's WSPP docs, in MS-SNTP: * http://msdn.microsoft.com/en-us/library/cc212930.aspx */ - } else if (has_mac == MAX_MD5_LEN && (restrict_mask & RES_MSSNTP) && - (retcode == AM_FXMIT || retcode == AM_NEWPASS) && - (memcmp(zero_key, (char *)pkt + authlen + 4, MAX_MD5_LEN - 4) == - 0)) { + } else if ( has_mac == MAX_MD5_LEN + && (restrict_mask & RES_MSSNTP) + && (retcode == AM_FXMIT || retcode == AM_NEWPASS) + && (memcmp(zero_key, (char *)pkt + authlen + 4, + MAX_MD5_LEN - 4) == 0)) { is_authentic = AUTH_NONE; #endif /* HAVE_NTP_SIGND */ @@ -754,8 +800,9 @@ receive( * mobilized. However, if this is from * the wildcard interface, game over. */ - if (crypto_flags && rbufp->dstadr == - ANY_INTERFACE_CHOOSE(&rbufp->recv_srcadr)) { + if ( crypto_flags + && rbufp->dstadr == + ANY_INTERFACE_CHOOSE(&rbufp->recv_srcadr)) { sys_restricted++; return; /* no wildcard */ } @@ -882,10 +929,10 @@ receive( * stratum is greater than the manycaster or the * manycaster has already synchronized to us. */ - if (sys_leap == LEAP_NOTINSYNC || sys_stratum >= - hisstratum || (!sys_cohort && sys_stratum == - hisstratum + 1) || rbufp->dstadr->addr_refid == - pkt->refid) { + if ( sys_leap == LEAP_NOTINSYNC + || sys_stratum >= hisstratum + || (!sys_cohort && sys_stratum == hisstratum + 1) + || rbufp->dstadr->addr_refid == pkt->refid) { sys_declined++; return; /* no help */ } @@ -933,9 +980,10 @@ receive( sys_restricted++; return; /* not enabled */ } - if (!AUTH((!(peer2->cast_flags & MDF_POOL) && - sys_authenticate) | (restrict_mask & (RES_NOPEER | - RES_DONTTRUST)), is_authentic)) { + if (!AUTH( (!(peer2->cast_flags & MDF_POOL) + && sys_authenticate) + || (restrict_mask & (RES_NOPEER | + RES_DONTTRUST)), is_authentic)) { sys_restricted++; return; /* access denied */ } @@ -944,8 +992,9 @@ receive( * Do not respond if unsynchronized or stratum is below * the floor or at or above the ceiling. */ - if (hisleap == LEAP_NOTINSYNC || hisstratum < - sys_floor || hisstratum >= sys_ceiling) { + if ( hisleap == LEAP_NOTINSYNC + || hisstratum < sys_floor + || hisstratum >= sys_ceiling) { sys_declined++; return; /* no help */ } @@ -1007,8 +1056,9 @@ receive( * Do not respond if unsynchronized or stratum is below * the floor or at or above the ceiling. */ - if (hisleap == LEAP_NOTINSYNC || hisstratum < - sys_floor || hisstratum >= sys_ceiling) { + if ( hisleap == LEAP_NOTINSYNC + || hisstratum < sys_floor + || hisstratum >= sys_ceiling) { sys_declined++; return; /* no help */ } @@ -1018,8 +1068,8 @@ receive( * Do not respond if Autokey and the opcode is not a * CRYPTO_ASSOC response with association ID. */ - if (crypto_flags && skeyid > NTP_MAXKEY && (opcode & - 0xffff0000) != (CRYPTO_ASSOC | CRYPTO_RESP)) { + if ( crypto_flags && skeyid > NTP_MAXKEY + && (opcode & 0xffff0000) != (CRYPTO_ASSOC | CRYPTO_RESP)) { sys_declined++; return; /* protocol error */ } @@ -1133,6 +1183,24 @@ receive( sys_restricted++; return; } + /* [Bug 2941] + * If we got here, the packet isn't part of an + * existing association, it isn't correctly + * authenticated, and it didn't meet either of + * the previous two special cases so we should + * just drop it on the floor. For example, + * crypto-NAKs (is_authentic == AUTH_CRYPTO) + * will make it this far. This is just + * debug-printed and not logged to avoid log + * flooding. + */ + DPRINTF(1, ("receive: at %ld refusing to mobilize passive association" + " with unknown peer %s mode %d keyid %08x len %d auth %d\n", + current_time, stoa(&rbufp->recv_srcadr), + hismode, skeyid, (authlen + has_mac), + is_authentic)); + sys_declined++; + return; } /* @@ -1145,8 +1213,8 @@ receive( * we will spin an ephemeral association in response to * MODE_ACTIVE KoDs, which will time out eventually. */ - if (hisleap != LEAP_NOTINSYNC && (hisstratum < - sys_floor || hisstratum >= sys_ceiling)) { + if ( hisleap != LEAP_NOTINSYNC + && (hisstratum < sys_floor || hisstratum >= sys_ceiling)) { sys_declined++; return; /* no help */ } @@ -1205,9 +1273,9 @@ receive( * have a public key ID; if not, the packet must have a * symmetric key ID. */ - if (is_authentic != AUTH_CRYPTO && (((peer->flags & - FLAG_SKEY) && skeyid <= NTP_MAXKEY) || (!(peer->flags & - FLAG_SKEY) && skeyid > NTP_MAXKEY))) { + if ( is_authentic != AUTH_CRYPTO + && ( ((peer->flags & FLAG_SKEY) && skeyid <= NTP_MAXKEY) + || (!(peer->flags & FLAG_SKEY) && skeyid > NTP_MAXKEY))) { sys_badauth++; return; } @@ -1256,16 +1324,23 @@ receive( * Check for bogus packet in basic mode. If found, switch to * interleaved mode and resynchronize, but only after confirming * the packet is not bogus in symmetric interleaved mode. + * + * This could also mean somebody is forging packets claiming to + * be from us, attempting to cause our server to KoD us. */ } else if (peer->flip == 0) { if (!L_ISEQU(&p_org, &peer->aorg)) { peer->bogusorg++; peer->flash |= TEST2; /* bogus */ - if (!L_ISZERO(&peer->dst) && L_ISEQU(&p_org, - &peer->dst)) { + msyslog(LOG_INFO, + "receive: Unexpected origin timestamp from %s", + ntoa(&peer->srcadr)); + if ( !L_ISZERO(&peer->dst) + && L_ISEQU(&p_org, &peer->dst)) { peer->flip = 1; report_event(PEVNT_XLEAVE, peer, NULL); } + return; /* Bogus packet, we are done */ } else { L_CLR(&peer->aorg); } @@ -1282,11 +1357,12 @@ receive( * can happen if a packet is lost, duplicated or crossed. If * found, flip and resynchronize. */ - } else if (!L_ISZERO(&peer->dst) && !L_ISEQU(&p_org, - &peer->dst)) { + } else if ( !L_ISZERO(&peer->dst) + && !L_ISEQU(&p_org, &peer->dst)) { peer->bogusorg++; peer->flags |= FLAG_XBOGUS; peer->flash |= TEST2; /* bogus */ + return; /* Bogus packet, we are done */ } /* @@ -1321,8 +1397,8 @@ receive( report_event(PEVNT_AUTH, peer, "digest"); peer->flash |= TEST5; /* bad auth */ peer->badauth++; - if (has_mac && - (hismode == MODE_ACTIVE || hismode == MODE_PASSIVE)) + if ( has_mac + && (hismode == MODE_ACTIVE || hismode == MODE_PASSIVE)) fast_xmit(rbufp, MODE_ACTIVE, 0, restrict_mask); if (peer->flags & FLAG_PREEMPT) { unpeer(peer); @@ -1351,11 +1427,22 @@ receive( * this maximum and advance the headway to give the sender some * headroom. Very intricate. */ + + /* + * Check for any kiss codes. Note this is only used when a server + * responds to a packet request + */ + + kissCode = kiss_code_check(hisleap, hisstratum, hismode, pkt->refid); + + /* + * Check to see if this is a RATE Kiss Code + * Currently this kiss code will accept whatever poll + * rate that the server sends + */ peer->ppoll = max(peer->minpoll, pkt->ppoll); - if (hismode == MODE_SERVER && hisleap == LEAP_NOTINSYNC && - hisstratum == STRATUM_UNSPEC && memcmp(&pkt->refid, - "RATE", 4) == 0) { - peer->selbroken++; + if (kissCode == RATEKISS) { + peer->selbroken++; /* Increment the KoD count */ report_event(PEVNT_RATE, peer, NULL); if (pkt->ppoll > peer->minpoll) peer->minpoll = peer->ppoll; @@ -1364,6 +1451,11 @@ receive( poll_update(peer, pkt->ppoll); return; /* kiss-o'-death */ } + if (kissCode != NOKISS) { + peer->selbroken++; /* Increment the KoD count */ + return; /* Drop any other kiss code packets */ + } + /* * That was hard and I am sweaty, but the packet is squeaky @@ -1455,8 +1547,8 @@ receive( int i; for (i = 0; ; i++) { - if (tkeyid == peer->pkeyid || - tkeyid == ap->key) { + if ( tkeyid == peer->pkeyid + || tkeyid == ap->key) { peer->flash &= ~TEST8; peer->pkeyid = skeyid; ap->seq -= i; @@ -1589,8 +1681,8 @@ process_packet( * Verify the server is synchronized; that is, the leap bits, * stratum and root distance are valid. */ - if (pleap == LEAP_NOTINSYNC || /* test 6 */ - pstratum < sys_floor || pstratum >= sys_ceiling) + if ( pleap == LEAP_NOTINSYNC /* test 6 */ + || pstratum < sys_floor || pstratum >= sys_ceiling) peer->flash |= TEST6; /* bad synch or strat */ if (p_del / 2 + p_disp >= MAXDISPERSE) /* test 7 */ peer->flash |= TEST7; /* bad header */ @@ -1823,8 +1915,9 @@ process_packet( * client mode when the client is fit and the autokey dance is * complete. */ - if ((FLAG_BC_VOL & peer->flags) && MODE_CLIENT == peer->hmode && - !(TEST11 & peer_unfit(peer))) { /* distance exceeded */ + if ( (FLAG_BC_VOL & peer->flags) + && MODE_CLIENT == peer->hmode + && !(TEST11 & peer_unfit(peer))) { /* distance exceeded */ #ifdef AUTOKEY if (peer->flags & FLAG_SKEY) { if (!(~peer->crypto & CRYPTO_FLAG_ALL)) @@ -1865,8 +1958,8 @@ clock_update( sys_poll = peer->maxpoll; poll_update(peer, sys_poll); sys_stratum = min(peer->stratum + 1, STRATUM_UNSPEC); - if (peer->stratum == STRATUM_REFCLOCK || - peer->stratum == STRATUM_UNSPEC) + if ( peer->stratum == STRATUM_REFCLOCK + || peer->stratum == STRATUM_UNSPEC) sys_refid = peer->refid; else sys_refid = addr2refid(&peer->srcadr); @@ -1992,12 +2085,12 @@ clock_update( * once is mostly harmless.) */ if (leapsec == LSPROX_NOWARN) { - if (leap_vote_ins > leap_vote_del + if ( leap_vote_ins > leap_vote_del && leap_vote_ins > sys_survivors / 2) { get_systime(&now); leapsec_add_dyn(TRUE, now.l_ui, NULL); } - if (leap_vote_del > leap_vote_ins + if ( leap_vote_del > leap_vote_ins && leap_vote_del > sys_survivors / 2) { get_systime(&now); leapsec_add_dyn(FALSE, now.l_ui, NULL); @@ -2320,8 +2413,8 @@ clock_filter( m = 0; for (i = 0; i < NTP_SHIFT; i++) { peer->filter_order[i] = (u_char) ord[i]; - if (dst[i] >= MAXDISPERSE || (m >= 2 && dst[i] >= - sys_maxdist)) + if ( dst[i] >= MAXDISPERSE + || (m >= 2 && dst[i] >= sys_maxdist)) continue; m++; } @@ -2367,10 +2460,11 @@ clock_filter( * than twice the host poll interval, consider the new sample * a popcorn spike and ignore it. */ - if (peer->disp < sys_maxdist && peer->filter_disp[k] < - sys_maxdist && etemp > CLOCK_SGATE * peer->jitter && - peer->filter_epoch[k] - peer->epoch < 2. * - ULOGTOD(peer->hpoll)) { + if ( peer->disp < sys_maxdist + && peer->filter_disp[k] < sys_maxdist + && etemp > CLOCK_SGATE * peer->jitter + && peer->filter_epoch[k] - peer->epoch + < 2. * ULOGTOD(peer->hpoll)) { snprintf(tbuf, sizeof(tbuf), "%.6f s", etemp); report_event(PEVNT_POPCORN, peer, tbuf); return; @@ -2547,14 +2641,14 @@ clock_select(void) if (!(peer->flags & FLAG_PREFER)) { switch (peer->refclktype) { case REFCLK_LOCALCLOCK: - if (current_time > orphwait && - typelocal == NULL) + if ( current_time > orphwait + && typelocal == NULL) typelocal = peer; continue; case REFCLK_ACTS: - if (current_time > orphwait && - typeacts == NULL) + if ( current_time > orphwait + && typeacts == NULL) typeacts = peer; continue; } @@ -2684,8 +2778,10 @@ clock_select(void) peer = peers[i].peer; h = peers[i].synch; - if ((high <= low || peer->offset + h < low || - peer->offset - h > high) && !(peer->flags & FLAG_TRUE)) + if (( high <= low + || peer->offset + h < low + || peer->offset - h > high + ) && !(peer->flags & FLAG_TRUE)) continue; #ifdef REFCLOCK @@ -2742,7 +2838,7 @@ clock_select(void) } /* - * Now, vote outlyers off the island by select jitter weighted + * Now, vote outliers off the island by select jitter weighted * by root distance. Continue voting as long as there are more * than sys_minclock survivors and the select jitter of the peer * with the worst metric is greater than the minimum peer @@ -2772,8 +2868,9 @@ clock_select(void) } } g = max(g, LOGTOD(sys_precision)); - if (nlist <= max(1, sys_minclock) || g <= d || - ((FLAG_TRUE | FLAG_PREFER) & peers[k].peer->flags)) + if ( nlist <= max(1, sys_minclock) + || g <= d + || ((FLAG_TRUE | FLAG_PREFER) & peers[k].peer->flags)) break; DPRINTF(3, ("select: drop %s seljit %.6f jit %.6f\n", @@ -2898,10 +2995,12 @@ clock_select(void) * if there is a prefer peer or there are no survivors and none * are required. */ - if (typepps != NULL && fabs(sys_offset) < 0.4 && - (typepps->refclktype != REFCLK_ATOM_PPS || - (typepps->refclktype == REFCLK_ATOM_PPS && (sys_prefer != - NULL || (typesystem == NULL && sys_minsane == 0))))) { + if ( typepps != NULL + && fabs(sys_offset) < 0.4 + && ( typepps->refclktype != REFCLK_ATOM_PPS + || ( typepps->refclktype == REFCLK_ATOM_PPS + && ( sys_prefer != NULL + || (typesystem == NULL && sys_minsane == 0))))) { typesystem = typepps; sys_clockhop = 0; typesystem->new_status = CTL_PST_SEL_PPS; @@ -3240,16 +3339,16 @@ peer_xmit( * autokey sequence, the autokey exchange is * used to retrieve the autokey values. */ - else if (sys_leap != LEAP_NOTINSYNC && - peer->leap != LEAP_NOTINSYNC && - !(peer->crypto & CRYPTO_FLAG_COOK)) + else if ( sys_leap != LEAP_NOTINSYNC + && peer->leap != LEAP_NOTINSYNC + && !(peer->crypto & CRYPTO_FLAG_COOK)) exten = crypto_args(peer, CRYPTO_COOK, peer->associd, NULL); else if (!(peer->crypto & CRYPTO_FLAG_AUTO)) exten = crypto_args(peer, CRYPTO_AUTO, peer->associd, NULL); - else if (peer->flags & FLAG_ASSOC && - peer->crypto & CRYPTO_FLAG_SIGN) + else if ( peer->flags & FLAG_ASSOC + && peer->crypto & CRYPTO_FLAG_SIGN) exten = crypto_args(peer, CRYPTO_AUTO | CRYPTO_RESP, peer->assoc, NULL); @@ -3693,7 +3792,7 @@ pool_xmit( pool->hostname)); else msyslog(LOG_ERR, - "unable to start pool DNS %s %m", + "unable to start pool DNS %s: %m", pool->hostname); return; } @@ -3883,8 +3982,9 @@ peer_unfit( * synchronized, (2) the server stratum is below the floor or * greater than or equal to the ceiling. */ - if (peer->leap == LEAP_NOTINSYNC || peer->stratum < sys_floor || - peer->stratum >= sys_ceiling) + if ( peer->leap == LEAP_NOTINSYNC + || peer->stratum < sys_floor + || peer->stratum >= sys_ceiling) rval |= TEST10; /* bad synch or stratum */ /* @@ -3892,8 +3992,9 @@ peer_unfit( * distance is greater than or equal to the distance threshold * plus the increment due to one host poll interval. */ - if (!(peer->flags & FLAG_REFCLOCK) && root_distance(peer) >= - sys_maxdist + clock_phi * ULOGTOD(peer->hpoll)) + if ( !(peer->flags & FLAG_REFCLOCK) + && root_distance(peer) >= sys_maxdist + + clock_phi * ULOGTOD(peer->hpoll)) rval |= TEST11; /* distance exceeded */ /* diff --git a/contrib/ntp/ntpd/ntp_refclock.c b/contrib/ntp/ntpd/ntp_refclock.c index f0e9b9e..1f16ca7 100644 --- a/contrib/ntp/ntpd/ntp_refclock.c +++ b/contrib/ntp/ntpd/ntp_refclock.c @@ -1049,7 +1049,7 @@ refclock_control( if (NULL == peer) return; - NTP_INSIST(peer->procptr != NULL); + INSIST(peer->procptr != NULL); pp = peer->procptr; /* diff --git a/contrib/ntp/ntpd/ntp_request.c b/contrib/ntp/ntpd/ntp_request.c index 8ffebad..6073f99 100644 --- a/contrib/ntp/ntpd/ntp_request.c +++ b/contrib/ntp/ntpd/ntp_request.c @@ -1757,10 +1757,12 @@ do_restrict( } /* - * Looks okay, try it out + * Looks okay, try it out. Needs to reload data pointer and + * item counter. (Talos-CAN-0052) */ ZERO_SOCK(&matchaddr); ZERO_SOCK(&matchmask); + items = INFO_NITEMS(inpkt->err_nitems); datap = inpkt->u.data; while (items-- > 0) { @@ -1917,9 +1919,11 @@ reset_peer( } /* - * Now do it in earnest. + * Now do it in earnest. Needs to reload data pointer and item + * counter. (Talos-CAN-0052) */ - + + items = INFO_NITEMS(inpkt->err_nitems); datap = inpkt->u.data; while (items-- > 0) { ZERO(cp); diff --git a/contrib/ntp/ntpd/ntp_restrict.c b/contrib/ntp/ntpd/ntp_restrict.c index 9948d54..82bbaef 100644 --- a/contrib/ntp/ntpd/ntp_restrict.c +++ b/contrib/ntp/ntpd/ntp_restrict.c @@ -173,7 +173,7 @@ alloc_res4(void) LINK_SLIST(resfree4, res, link); res = (void *)((char *)res - cb); } - NTP_INSIST(rl == res); + INSIST(rl == res); /* allocate the first */ return res; } @@ -199,7 +199,7 @@ alloc_res6(void) LINK_SLIST(resfree6, res, link); res = (void *)((char *)res - cb); } - NTP_INSIST(rl == res); + INSIST(rl == res); /* allocate the first */ return res; } @@ -223,7 +223,7 @@ free_res( else plisthead = &restrictlist4; UNLINK_SLIST(unlinked, *plisthead, res, link, restrict_u); - NTP_INSIST(unlinked == res); + INSIST(unlinked == res); if (v6) { zero_mem(res, V6_SIZEOF_RESTRICT_U); @@ -291,7 +291,7 @@ match_restrict6_addr( for (res = restrictlist6; res != NULL; res = next) { next = res->link; - NTP_INSIST(next != res); + INSIST(next != res); if (res->expire && res->expire <= current_time) free_res(res, v6); @@ -435,6 +435,9 @@ restrictions( match = match_restrict4_addr(SRCADR(srcadr), SRCPORT(srcadr)); + + INSIST(match != NULL); + match->count++; /* * res_not_found counts only use of the final default @@ -461,6 +464,7 @@ restrictions( return (int)RES_IGNORE; match = match_restrict6_addr(pin6, SRCPORT(srcadr)); + INSIST(match != NULL); match->count++; if (&restrict_def6 == match) res_not_found++; @@ -494,8 +498,8 @@ hack_restrict( op, stoa(resaddr), stoa(resmask), mflags, flags)); if (NULL == resaddr) { - NTP_REQUIRE(NULL == resmask); - NTP_REQUIRE(RESTRICT_FLAGS == op); + REQUIRE(NULL == resmask); + REQUIRE(RESTRICT_FLAGS == op); restrict_source_flags = flags; restrict_source_mflags = mflags; restrict_source_enabled = 1; @@ -503,9 +507,13 @@ hack_restrict( } ZERO(match); + +#if 0 /* silence VC9 potentially uninit warnings */ + // HMS: let's use a compiler-specific "enable" for this. res = NULL; v6 = 0; +#endif if (IS_IPV4(resaddr)) { v6 = 0; @@ -528,7 +536,7 @@ hack_restrict( &match.u.v6.mask); } else /* not IPv4 nor IPv6 */ - NTP_REQUIRE(0); + REQUIRE(0); match.flags = flags; match.mflags = mflags; @@ -600,7 +608,7 @@ hack_restrict( break; default: /* unknown op */ - NTP_INSIST(0); + INSIST(0); break; } @@ -626,7 +634,7 @@ restrict_source( IS_MCAST(addr) || ISREFCLOCKADR(addr)) return; - NTP_REQUIRE(AF_INET == AF(addr) || AF_INET6 == AF(addr)); + REQUIRE(AF_INET == AF(addr) || AF_INET6 == AF(addr)); SET_HOSTMASK(&onesmask, AF(addr)); if (farewell) { @@ -647,10 +655,12 @@ restrict_source( */ if (IS_IPV4(addr)) { res = match_restrict4_addr(SRCADR(addr), SRCPORT(addr)); + INSIST(res != NULL); found_specific = (SRCADR(&onesmask) == res->u.v4.mask); } else { res = match_restrict6_addr(&SOCK_ADDR6(addr), SRCPORT(addr)); + INSIST(res != NULL); found_specific = ADDR6_EQ(&res->u.v6.mask, &SOCK_ADDR6(&onesmask)); } diff --git a/contrib/ntp/ntpd/ntp_timer.c b/contrib/ntp/ntpd/ntp_timer.c index 5cbb892..828aa8c 100644 --- a/contrib/ntp/ntpd/ntp_timer.c +++ b/contrib/ntp/ntpd/ntp_timer.c @@ -57,6 +57,12 @@ static void check_leapsec(u_int32, const time_t*, int/*BOOL*/); volatile int interface_interval; /* init_io() sets def. 300s */ /* + * Initializing flag. All async routines watch this and only do their + * thing when it is clear. + */ +int initializing; + +/* * Alarm flag. The mainline code imports this. */ volatile int alarm_flag; diff --git a/contrib/ntp/ntpd/ntpd-opts.c b/contrib/ntp/ntpd/ntpd-opts.c index 2d547a1..1bbecfa 100644 --- a/contrib/ntp/ntpd/ntpd-opts.c +++ b/contrib/ntp/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed June 29, 2015 at 04:28:19 PM by AutoGen 5.18.5 + * It has been AutoGen-ed October 21, 2015 at 12:36:00 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -75,7 +75,7 @@ extern FILE * option_usage_fp; * static const strings for ntpd options */ static char const ntpd_opt_strs[3129] = -/* 0 */ "ntpd 4.2.8p3\n" +/* 0 */ "ntpd 4.2.8p4\n" "Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" @@ -205,12 +205,12 @@ static char const ntpd_opt_strs[3129] = /* 2900 */ "output version information and exit\0" /* 2936 */ "version\0" /* 2944 */ "NTPD\0" -/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p3\n" +/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p4\n" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n" "\t\t[ <server1> ... <serverN> ]\n\0" /* 3080 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3114 */ "\n\0" -/* 3116 */ "ntpd 4.2.8p3"; +/* 3116 */ "ntpd 4.2.8p4"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.8p3\n\ + puts(_("ntpd 4.2.8p4\n\ Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation, all rights reserved.\n\ This is free software. It is licensed for use, modification and\n\ redistribution under the terms of the NTP License, copies of which\n\ @@ -1670,7 +1670,7 @@ implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.8p3\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.8p4\n\ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ \t\t[ <server1> ... <serverN> ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.8p3")); + puts(_("ntpd 4.2.8p4")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<<NOT-FOUND>>>")); diff --git a/contrib/ntp/ntpd/ntpd-opts.def b/contrib/ntp/ntpd/ntpd-opts.def index dee484d..00d3511 100644 --- a/contrib/ntp/ntpd/ntpd-opts.def +++ b/contrib/ntp/ntpd/ntpd-opts.def @@ -236,6 +236,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run .Xr ntpdate 1ntpdatemdoc +or +.Xr sntp 1sntpmdoc to get the system clock close to correct before starting .Xr ntpd 1ntpdmdoc , but this was never more than a mediocre hack and is no longer needed. @@ -245,7 +247,9 @@ and you still need to set the system time before starting .Nm , please open a bug report and document what is going on, and then look at using -.Xr sntp 1sntpmdoc . +.Xr sntp 1sntpmdoc +if you really need to set the clock before starting +.Nm . .Pp There is a way to start .Xr ntpd 1ntpdmdoc diff --git a/contrib/ntp/ntpd/ntpd-opts.h b/contrib/ntp/ntpd/ntpd-opts.h index 21142d8..d87c221 100644 --- a/contrib/ntp/ntpd/ntpd-opts.h +++ b/contrib/ntp/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed June 29, 2015 at 04:28:18 PM by AutoGen 5.18.5 + * It has been AutoGen-ed October 21, 2015 at 12:35:59 PM by AutoGen 5.18.5 * From the definitions ntpd-opts.def * and the template file options * @@ -106,9 +106,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 38 /** ntpd version */ -#define NTPD_VERSION "4.2.8p3" +#define NTPD_VERSION "4.2.8p4" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.8p3" +#define NTPD_FULL_VERSION "ntpd 4.2.8p4" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/contrib/ntp/ntpd/ntpd.1ntpdman b/contrib/ntp/ntpd/ntpd.1ntpdman index c231b7f..187a79a 100644 --- a/contrib/ntp/ntpd/ntpd.1ntpdman +++ b/contrib/ntp/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "29 Jun 2015" "4.2.8p3" "User Commands" +.TH ntpd 1ntpdman "21 Oct 2015" "4.2.8p4" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LZaapD/ag-XZa4nD) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dUaOfK/ag-qUaGeK) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:24 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:11 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -602,6 +602,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run \fCntpdate\f[]\fR(1ntpdatemdoc)\f[] +or +\fCsntp\f[]\fR(1sntpmdoc)\f[] to get the system clock close to correct before starting \fCntpd\f[]\fR(1ntpdmdoc)\f[], but this was never more than a mediocre hack and is no longer needed. @@ -611,7 +613,9 @@ and you still need to set the system time before starting \f\*[B-Font]ntpd\fP, please open a bug report and document what is going on, and then look at using -\fCsntp\f[]\fR(1sntpmdoc)\f[]. +\fCsntp\f[]\fR(1sntpmdoc)\f[] +if you really need to set the clock before starting +\f\*[B-Font]ntpd\fP. .sp \n(Ppu .ne 2 diff --git a/contrib/ntp/ntpd/ntpd.1ntpdmdoc b/contrib/ntp/ntpd/ntpd.1ntpdmdoc index 08d7655..139de52 100644 --- a/contrib/ntp/ntpd/ntpd.1ntpdmdoc +++ b/contrib/ntp/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:41 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:30 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -532,6 +532,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run .Xr ntpdate 1ntpdatemdoc +or +.Xr sntp 1sntpmdoc to get the system clock close to correct before starting .Xr ntpd 1ntpdmdoc , but this was never more than a mediocre hack and is no longer needed. @@ -541,7 +543,9 @@ and you still need to set the system time before starting .Nm , please open a bug report and document what is going on, and then look at using -.Xr sntp 1sntpmdoc . +.Xr sntp 1sntpmdoc +if you really need to set the clock before starting +.Nm . .Pp There is a way to start .Xr ntpd 1ntpdmdoc diff --git a/contrib/ntp/ntpd/ntpd.c b/contrib/ntp/ntpd/ntpd.c index 529e6ce..a517391 100644 --- a/contrib/ntp/ntpd/ntpd.c +++ b/contrib/ntp/ntpd/ntpd.c @@ -27,6 +27,14 @@ #include "ntp_libopts.h" #include "ntpd-opts.h" +/* there's a short treatise below what the thread stuff is for */ +#if defined(HAVE_PTHREADS) && HAVE_PTHREADS && !defined(NO_THREADS) +# ifdef HAVE_PTHREAD_H +# include <pthread.h> +# endif +# define NEED_PTHREAD_WARMUP +#endif + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -180,12 +188,6 @@ int waitsync_fd_to_close = -1; /* -w/--wait-sync */ #endif /* - * Initializing flag. All async routines watch this and only do their - * thing when it is clear. - */ -int initializing; - -/* * Version declaration */ extern const char *Version; @@ -238,6 +240,68 @@ static void library_unexpected_error(const char *, int, #endif /* !SIM */ +/* Bug2332 unearthed a problem in the interaction of reduced user + * privileges, the limits on memory usage and some versions of the + * pthread library on Linux systems. The 'pthread_cancel()' function and + * likely some others need to track the stack of the thread involved, + * and uses a function that comes from GCC (--> libgcc_s.so) to do + * this. Unfortunately the developers of glibc decided to load the + * library on demand, which speeds up program start but can cause + * trouble here: Due to all the things NTPD does to limit its resource + * usage, this deferred load of libgcc_s does not always work once the + * restrictions are in effect. + * + * One way out of this was attempting a forced link against libgcc_s + * when possible because it makes the library available immediately + * without deferred load. (The symbol resolution would still be dynamic + * and on demand, but the code would already be in the process image.) + * + * This is a tricky thing to do, since it's not necessary everywhere, + * not possible everywhere, has shown to break the build of other + * programs in the NTP suite and is now generally frowned upon. + * + * So we take a different approach here: We creat a worker thread that does + * actually nothing except waiting for cancellation and cancel it. If + * this is done before all the limitations are put in place, the + * machinery is pre-heated and all the runtime stuff should be in place + * and useable when needed. + * + * This uses only the standard pthread API and should work with all + * implementations of pthreads. It is not necessary everywhere, but it's + * cheap enough to go on nearly unnoticed. + */ +#ifdef NEED_PTHREAD_WARMUP + +/* simple thread function: sleep until cancelled, just to exercise + * thread cancellation. + */ +static void* +my_pthread_warmup_worker( + void *thread_args) +{ + (void)thread_args; + for (;;) + sleep(10); + return NULL; +} + +/* pre-heat threading: create a thread and cancel it, just to exercise + * thread cancellation. + */ +static void +my_pthread_warmup(void) +{ + pthread_t thread; + int rc; + rc = pthread_create( + &thread, NULL, my_pthread_warmup_worker, NULL); + if (0 == rc) { + pthread_cancel(thread); + pthread_join(thread, NULL); + } +} + +#endif /*defined(NEED_PTHREAD_WARMUP)*/ void @@ -451,6 +515,10 @@ ntpdmain( int zero; # endif +# ifdef NEED_PTHREAD_WARMUP + my_pthread_warmup(); +# endif + # ifdef HAVE_UMASK uv = umask(0); if (uv) @@ -791,13 +859,16 @@ ntpdmain( */ getconfig(argc, argv); - if (do_memlock) { + if (-1 == cur_memlock) { # if defined(HAVE_MLOCKALL) /* * lock the process into memory */ - if (!HAVE_OPT(SAVECONFIGQUIT) && - 0 != mlockall(MCL_CURRENT|MCL_FUTURE)) + if ( !HAVE_OPT(SAVECONFIGQUIT) +# ifdef RLIMIT_MEMLOCK + && -1 != DFLT_RLIMIT_MEMLOCK +# endif + && 0 != mlockall(MCL_CURRENT|MCL_FUTURE)) msyslog(LOG_ERR, "mlockall(): %m"); # else /* !HAVE_MLOCKALL follows */ # ifdef HAVE_PLOCK @@ -937,10 +1008,17 @@ getgroup: msyslog(LOG_ERR, "Cannot setegid() to group `%s': %m", group); exit (-1); } - if (group) - setgroups(1, &sw_gid); - else - initgroups(pw->pw_name, pw->pw_gid); + if (group) { + if (0 != setgroups(1, &sw_gid)) { + msyslog(LOG_ERR, "setgroups(1, %d) failed: %m", sw_gid); + exit (-1); + } + } + else if (pw) + if (0 != initgroups(pw->pw_name, pw->pw_gid)) { + msyslog(LOG_ERR, "initgroups(<%s>, %d) filed: %m", pw->pw_name, pw->pw_gid); + exit (-1); + } if (user && setuid(sw_uid)) { msyslog(LOG_ERR, "Cannot setuid() to user `%s': %m", user); exit (-1); diff --git a/contrib/ntp/ntpd/ntpd.html b/contrib/ntp/ntpd/ntpd.html index 7af6d98..8d6f9d6 100644 --- a/contrib/ntp/ntpd/ntpd.html +++ b/contrib/ntp/ntpd/ntpd.html @@ -39,7 +39,7 @@ The program can operate in any of several modes, including client/server, symmetric and broadcast modes, and with both symmetric-key and public-key cryptography. - <p>This document applies to version 4.2.8p3 of <code>ntpd</code>. + <p>This document applies to version 4.2.8p4 of <code>ntpd</code>. <ul class="menu"> <li><a accesskey="1" href="#ntpd-Description">ntpd Description</a>: Description @@ -220,7 +220,7 @@ the usage text by passing it through a pager program. used to select the program, defaulting to <span class="file">more</span>. Both will exit with a status code of 0. -<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p3-RC3 +<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p4-sec-RC2 Usage: ntpd [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \ [ <server1> ... <serverN> ] Flg Arg Option-Name Description diff --git a/contrib/ntp/ntpd/ntpd.man.in b/contrib/ntp/ntpd/ntpd.man.in index c7c4eec..21bd884 100644 --- a/contrib/ntp/ntpd/ntpd.man.in +++ b/contrib/ntp/ntpd/ntpd.man.in @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd @NTPD_MS@ "29 Jun 2015" "4.2.8p3" "User Commands" +.TH ntpd @NTPD_MS@ "21 Oct 2015" "4.2.8p4" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LZaapD/ag-XZa4nD) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-dUaOfK/ag-qUaGeK) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:24 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:11 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -602,6 +602,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run \fCntpdate\f[]\fR(@NTPDATE_MS@)\f[] +or +\fCsntp\f[]\fR(@SNTP_MS@)\f[] to get the system clock close to correct before starting \fCntpd\f[]\fR(@NTPD_MS@)\f[], but this was never more than a mediocre hack and is no longer needed. @@ -611,7 +613,9 @@ and you still need to set the system time before starting \f\*[B-Font]ntpd\fP, please open a bug report and document what is going on, and then look at using -\fCsntp\f[]\fR(@SNTP_MS@)\f[]. +\fCsntp\f[]\fR(@SNTP_MS@)\f[] +if you really need to set the clock before starting +\f\*[B-Font]ntpd\fP. .sp \n(Ppu .ne 2 diff --git a/contrib/ntp/ntpd/ntpd.mdoc.in b/contrib/ntp/ntpd/ntpd.mdoc.in index 7d87d85..ad71af9 100644 --- a/contrib/ntp/ntpd/ntpd.mdoc.in +++ b/contrib/ntp/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 29 2015 +.Dd October 21 2015 .Dt NTPD @NTPD_MS@ User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 29, 2015 at 04:30:41 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed October 21, 2015 at 12:38:30 PM by AutoGen 5.18.5 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -532,6 +532,8 @@ when you have permission to do so from the owner of the target host. Finally, in the past many startup scripts would run .Xr ntpdate @NTPDATE_MS@ +or +.Xr sntp @SNTP_MS@ to get the system clock close to correct before starting .Xr ntpd @NTPD_MS@ , but this was never more than a mediocre hack and is no longer needed. @@ -541,7 +543,9 @@ and you still need to set the system time before starting .Nm , please open a bug report and document what is going on, and then look at using -.Xr sntp @SNTP_MS@ . +.Xr sntp @SNTP_MS@ +if you really need to set the clock before starting +.Nm . .Pp There is a way to start .Xr ntpd @NTPD_MS@ diff --git a/contrib/ntp/ntpd/rc_cmdlength.c b/contrib/ntp/ntpd/rc_cmdlength.c index 2807d2a..922312e 100644 --- a/contrib/ntp/ntpd/rc_cmdlength.c +++ b/contrib/ntp/ntpd/rc_cmdlength.c @@ -1,4 +1,5 @@ #include <config.h> +#include <rc_cmdlength.h> #if HAVE_UNISTD_H # include <unistd.h> diff --git a/contrib/ntp/ntpd/refclock_arc.c b/contrib/ntp/ntpd/refclock_arc.c index e5d4cb4..7daae8d 100644 --- a/contrib/ntp/ntpd/refclock_arc.c +++ b/contrib/ntp/ntpd/refclock_arc.c @@ -657,7 +657,7 @@ arc_start( return 0; } close(temp_fd); - temp_fd = -1; + temp_fd = -1; /* not used after this, at *this* time. */ #ifndef SYS_WINNT if (-1 == fcntl(fd, F_SETFL, 0)) /* clear the descriptor flags */ diff --git a/contrib/ntp/ntpd/refclock_chu.c b/contrib/ntp/ntpd/refclock_chu.c index 6b1ae55..1f02a1c 100644 --- a/contrib/ntp/ntpd/refclock_chu.c +++ b/contrib/ntp/ntpd/refclock_chu.c @@ -1194,7 +1194,7 @@ chu_a( * only if the maximum distance is at least MINSYNC. */ up->syndist = k = 0; - val = -16; + // val = -16; for (i = -1; i < 2; i++) { temp = up->cbuf[i + 4] & 0xf; if (i >= 0) diff --git a/contrib/ntp/ntpd/refclock_gpsdjson.c b/contrib/ntp/ntpd/refclock_gpsdjson.c index 0a88cec..c2bf09a 100644 --- a/contrib/ntp/ntpd/refclock_gpsdjson.c +++ b/contrib/ntp/ntpd/refclock_gpsdjson.c @@ -1113,9 +1113,9 @@ strtojint( /* Now try to convert a sequence of digits. */ hold = cp; accu = 0; - while (isdigit(*(const unsigned char*)cp)) { + while (isdigit(*(const u_char*)cp)) { flags |= (accu > limit_lo); - accu = accu * 10 + (*(const unsigned char*)cp++ - '0'); + accu = accu * 10 + (*(const u_char*)cp++ - '0'); flags |= (accu > limit_hi); } /* Check for empty conversion (no digits seen). */ @@ -2086,8 +2086,8 @@ convert_ascii_time( return FALSE; /* could not parse the mandatory stuff! */ if (*ep == '.') { dw = 100000000u; - while (isdigit(*(unsigned char*)++ep)) { - ts.tv_nsec += (*(unsigned char*)ep - '0') * dw; + while (isdigit(*(u_char*)++ep)) { + ts.tv_nsec += (*(u_char*)ep - '0') * dw; dw /= 10u; } } @@ -2189,16 +2189,16 @@ log_data( char *dtop = s_lbuf + sizeof(s_lbuf) - 1; /* for NUL */ while (sptr != stop && dptr != dtop) { - if (*sptr == '\\') { + u_char uch = (u_char)*sptr++; + if (uch == '\\') { dptr = add_string(dptr, dtop, "\\\\"); - } else if (isprint(*sptr)) { - *dptr++ = *sptr; + } else if (isprint(uch)) { + *dptr++ = (char)uch; } else { char fbuf[6]; - snprintf(fbuf, sizeof(fbuf), "\\%03o", *(const u_char*)sptr); + snprintf(fbuf, sizeof(fbuf), "\\%03o", uch); dptr = add_string(dptr, dtop, fbuf); } - sptr++; } *dptr = '\0'; mprintf("%s[%s]: '%s'\n", up->logname, what, s_lbuf); diff --git a/contrib/ntp/ntpd/refclock_local.c b/contrib/ntp/ntpd/refclock_local.c index d1b2871..d816c55 100644 --- a/contrib/ntp/ntpd/refclock_local.c +++ b/contrib/ntp/ntpd/refclock_local.c @@ -55,15 +55,7 @@ * * Fudge Factors * - * If fudge flag1 is lit, the leap second bit is set in the peer - * status word. It should be set early in the day of a leap second - * event and set dark on the day after the event. - * - * Note the fudge time1 and time2 have been deprecated. The fudge time1 - * was intended to apply a bias offset. This can be done using the Unix - * date command. The fudge time2 was intended to apply a bias frequency. - * This can be done using the frequency file and/or the freq - * configuration command. + * None currently supported. */ /* * Local interface definitions @@ -179,9 +171,7 @@ local_poll( /* * Ramble through the usual filtering and grooming code, which * is essentially a no-op and included mostly for pretty - * billboards. We allow a one-time time adjustment using fudge - * time1 (s) and a continuous frequency adjustment using fudge - * time 2 (ppm). + * billboards. */ poll_time = current_time; refclock_process_offset(pp, pp->lastrec, pp->lastrec, 0); @@ -215,10 +205,6 @@ local_poll( pp->disp = 0; pp->jitter = 0; #else /* KERNEL_PLL LOCKCLOCK */ - if (pp->sloppyclockflag & CLK_FLAG1) - pp->leap = LEAP_ADDSECOND; - else - pp->leap = LEAP_NOWARNING; pp->disp = DISPERSION; pp->jitter = 0; #endif /* KERNEL_PLL LOCKCLOCK */ diff --git a/contrib/ntp/ntpd/refclock_nmea.c b/contrib/ntp/ntpd/refclock_nmea.c index 126b530..b1ea294 100644 --- a/contrib/ntp/ntpd/refclock_nmea.c +++ b/contrib/ntp/ntpd/refclock_nmea.c @@ -810,9 +810,10 @@ nmea_receive( ZERO(tofs); ZERO(date); ZERO(gpsw); - sentence = 0; - rc_date = 0; - rc_time = 0; + sentence = 0; // Should never be needed. + rc_date = 0; // Should never be needed. + rc_time = 0; // Should never be needed. + /* * Read the timecode and timestamp, then initialise field * processing. The <CR><LF> at the NMEA line end is translated diff --git a/contrib/ntp/ntpd/refclock_palisade.c b/contrib/ntp/ntpd/refclock_palisade.c index 0520311..921c815 100644 --- a/contrib/ntp/ntpd/refclock_palisade.c +++ b/contrib/ntp/ntpd/refclock_palisade.c @@ -218,7 +218,7 @@ init_thunderbolt ( struct packettx tx; tx.size = 0; - tx.data = (u_char *) malloc(100); + tx.data = (u_char *) emalloc(100); /* set UTC time */ sendsupercmd (&tx, 0x8E, 0xA2); @@ -246,7 +246,7 @@ init_acutime ( struct packettx tx; tx.size = 0; - tx.data = (u_char *) malloc(100); + tx.data = (u_char *) emalloc(100); sendsupercmd(&tx, 0x8E, 0xA5); sendbyte(&tx, 0x02); diff --git a/contrib/ntp/ntpd/refclock_parse.c b/contrib/ntp/ntpd/refclock_parse.c index 147a462..8e90595 100644 --- a/contrib/ntp/ntpd/refclock_parse.c +++ b/contrib/ntp/ntpd/refclock_parse.c @@ -2587,6 +2587,9 @@ parsestate( i++; } t = ap(buffer, size, t, ")"); + /* t is unused here, but if we don't track it and + * need it later, that's a bug waiting to happen. + */ } return buffer; } diff --git a/contrib/ntp/ntpd/refclock_wwv.c b/contrib/ntp/ntpd/refclock_wwv.c index 79c0afd..2736cfa 100644 --- a/contrib/ntp/ntpd/refclock_wwv.c +++ b/contrib/ntp/ntpd/refclock_wwv.c @@ -2241,6 +2241,7 @@ wwv_tsec( temp = carry(&up->decvec[HR]); if (temp == 0) temp = carry(&up->decvec[HR + 1]); + // XXX: Does temp have an expected value here? /* * Decode the current minute and day. Set leap day if the @@ -2271,7 +2272,7 @@ wwv_tsec( if (minute != 1440) return; - minute = 0; + // minute = 0; while (carry(&up->decvec[HR]) != 0); /* advance to minute 0 */ while (carry(&up->decvec[HR + 1]) != 0); day++; @@ -2280,6 +2281,7 @@ wwv_tsec( temp = carry(&up->decvec[DA + 1]); if (temp == 0) temp = carry(&up->decvec[DA + 2]); + // XXX: Is there an expected value of temp here? /* * Roll the year if this the first day and propagate carries @@ -2288,7 +2290,7 @@ wwv_tsec( if (day != (isleap ? 365 : 366)) return; - day = 1; + // day = 1; while (carry(&up->decvec[DA]) != 1); /* advance to day 1 */ while (carry(&up->decvec[DA + 1]) != 0); while (carry(&up->decvec[DA + 2]) != 0); |
