From: Harlan Stenn Date: Wed, 8 Jan 2014 11:47:41 +0000 (+0000) Subject: NTP_4_2_7P410 X-Git-Tag: NTP_4_2_7P410^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4f7ad8300815a8180cb21ec1486eef91a0612a3;p=thirdparty%2Fntp.git NTP_4_2_7P410 bk: 52cd3addb-hJwjazflpaZR8E1DsglA --- diff --git a/ChangeLog b/ChangeLog index 265a013dc..ce6ea5039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p410) 2014/01/08 Released by Harlan Stenn * [Bug 2332] Force reference to 'libgcc_s' when using GCC, because threading+restricted user+locked memory otherwise fails on Linux. * [Bug 2530] Fix documentation for enable/disable mode7 and pps. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 40aa5b10c..c730f3969 100644 --- a/ntpd/invoke-ntp.conf.texi +++ b/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed January 4, 2014 at 11:15:58 AM by AutoGen 5.18.3pre5 +# It has been AutoGen-ed January 8, 2014 at 11:43:18 AM by AutoGen 5.18.3pre11 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2265,8 +2265,8 @@ This implies that must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. -@item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{monitor} | @code{ntp} | @code{pps} | @code{stats}]} -@item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{monitor} | @code{ntp} | @code{pps} | @code{stats}]} +@item @code{enable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} +@item @code{disable} @code{[@code{auth} | @code{bclient} | @code{calibrate} | @code{kernel} | @code{mode7} | @code{monitor} | @code{ntp} | @code{stats}]} Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2300,6 +2300,19 @@ flag is @code{enable} if support is available, otherwise @code{disable}. +@item @code{mode7} +Enables processing of NTP mode 7 implementation-specific requests +which are used by the deprecated +@code{ntpdc(1ntpdcmdoc)} +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +@code{ntpq(1ntpqmdoc)}. +The +@code{ntpq(1ntpqmdoc)} +program provides the same capabilities as +@code{ntpdc(1ntpdcmdoc)} +using standard mode 6 requests. @item @code{monitor} Enables the monitoring facility. See the @@ -2318,17 +2331,6 @@ closes the feedback loop, which is useful for testing. The default for this flag is @code{enable}. -@item @code{pps} -Enables the pulse-per-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -"A Kernel Model for Precision Timekeeping" -(available as part of the HTML documentation -provided in -@file{/usr/share/doc/ntp}) -page for further information. -The default for this flag is -@code{disable}. @item @code{stats} Enables the statistics facility. See the diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index d9e3833e1..18381fec1 100644 --- a/ntpd/invoke-ntp.keys.texi +++ b/ntpd/invoke-ntp.keys.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.keys.texi) # -# It has been AutoGen-ed January 4, 2014 at 11:16:01 AM by AutoGen 5.18.3pre5 +# It has been AutoGen-ed January 8, 2014 at 11:43:20 AM by AutoGen 5.18.3pre11 # From the definitions ntp.keys.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index a4d24b0a1..a55eba92a 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed January 4, 2014 at 11:16:03 AM by AutoGen 5.18.3pre5 +# It has been AutoGen-ed January 8, 2014 at 11:43:22 AM by AutoGen 5.18.3pre11 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -141,7 +141,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p409 +ntpd - NTP daemon program - Ver. 4.2.7p410 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 26d8d4e32..ab7e46825 100644 --- a/ntpd/ntp.conf.5man +++ b/ntpd/ntp.conf.5man @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntp.conf 5man "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.conf 5man "08 Jan 2014" "4.2.7p410" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H2aWvy/ag-.5aWuy) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nHaaYF/ag-AHaaXF) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:35 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2541,9 +2541,9 @@ must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 -.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]pps\f[] | \f\*[B-Font]stats\f[]] +.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 -.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]pps\f[] | \f\*[B-Font]stats\f[]] +.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2582,6 +2582,20 @@ flag is if support is available, otherwise \f\*[B-Font]disable\f[]. .TP 7 +.NOP \f\*[B-Font]mode7\f[] +Enables processing of NTP mode 7 implementation-specific requests +which are used by the deprecated +\fCntpdc\fR(1ntpdcmdoc)\f[] +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +\fCntpq\fR(1ntpqmdoc)\f[]. +The +\fCntpq\fR(1ntpqmdoc)\f[] +program provides the same capabilities as +\fCntpdc\fR(1ntpdcmdoc)\f[] +using standard mode 6 requests. +.TP 7 .NOP \f\*[B-Font]monitor\f[] Enables the monitoring facility. See the @@ -2602,18 +2616,6 @@ The default for this flag is \f\*[B-Font]enable\f[]. .TP 7 -.NOP \f\*[B-Font]pps\f[] -Enables the pulse-per-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -"A Kernel Model for Precision Timekeeping" -(available as part of the HTML documentation -provided in -\fI/usr/share/doc/ntp\f[]) -page for further information. -The default for this flag is -\f\*[B-Font]disable\f[]. -.TP 7 .NOP \f\*[B-Font]stats\f[] Enables the statistics facility. See the @@ -2900,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5man "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.conf 5man "08 Jan 2014" "4.2.7p410" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H2aWvy/ag-.5aWuy) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nHaaYF/ag-AHaaXF) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:35 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2928,7 +2930,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES @@ -3010,7 +3012,7 @@ services when they become universally available. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. This document was derived from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index c94d156e3..e87c30dde 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 4 2014 +.Dd January 8 2014 .Dt NTP_CONF 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:16:06 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:25 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2364,16 +2364,16 @@ otherwise, should be avoided. .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc .It Xo Ic disable .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc Provides a way to enable or disable various server options. @@ -2409,6 +2409,19 @@ flag is .Ic enable if support is available, otherwise .Ic disable . +.It Cm mode7 +Enables processing of NTP mode 7 implementation\-specific requests +which are used by the deprecated +.Xr ntpdc 1ntpdcmdoc +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +.Xr ntpq 1ntpqmdoc . +The +.Xr ntpq 1ntpqmdoc +program provides the same capabilities as +.Xr ntpdc 1ntpdcmdoc +using standard mode 6 requests. .It Cm monitor Enables the monitoring facility. See the @@ -2427,17 +2440,6 @@ closes the feedback loop, which is useful for testing. The default for this flag is .Ic enable . -.It Cm pps -Enables the pulse\-per\-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -.Qq A Kernel Model for Precision Timekeeping -(available as part of the HTML documentation -provided in -.Pa /usr/share/doc/ntp ) -page for further information. -The default for this flag is -.Ic disable . .It Cm stats Enables the statistics facility. See the @@ -2745,7 +2747,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES @@ -2807,7 +2809,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 7b1c5f5d8..67d7411d5 100644 --- a/ntpd/ntp.conf.html +++ b/ntpd/ntp.conf.html @@ -33,7 +33,7 @@ Up: (dir)

This document describes the configuration file for the NTP Project's ntpd program. -

This document applies to version 4.2.7p409 of ntp.conf. +

This document applies to version 4.2.7p410 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 91f220db7..63abb8881 100644 --- a/ntpd/ntp.conf.man.in +++ b/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 "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.conf 5 "08 Jan 2014" "4.2.7p410" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H2aWvy/ag-.5aWuy) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nHaaYF/ag-AHaaXF) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:35 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2541,9 +2541,9 @@ must have write permission for the directory the drift file is located in, and that file system links, symbolic or otherwise, should be avoided. .TP 7 -.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]pps\f[] | \f\*[B-Font]stats\f[]] +.NOP \f\*[B-Font]enable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] .TP 7 -.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]pps\f[] | \f\*[B-Font]stats\f[]] +.NOP \f\*[B-Font]disable\f[] [\f\*[B-Font]auth\f[] | \f\*[B-Font]bclient\f[] | \f\*[B-Font]calibrate\f[] | \f\*[B-Font]kernel\f[] | \f\*[B-Font]mode7\f[] | \f\*[B-Font]monitor\f[] | \f\*[B-Font]ntp\f[] | \f\*[B-Font]stats\f[]] Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2582,6 +2582,20 @@ flag is if support is available, otherwise \f\*[B-Font]disable\f[]. .TP 7 +.NOP \f\*[B-Font]mode7\f[] +Enables processing of NTP mode 7 implementation-specific requests +which are used by the deprecated +\fCntpdc\fR(@NTPDC_MS@)\f[] +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +\fCntpq\fR(@NTPQ_MS@)\f[]. +The +\fCntpq\fR(@NTPQ_MS@)\f[] +program provides the same capabilities as +\fCntpdc\fR(@NTPDC_MS@)\f[] +using standard mode 6 requests. +.TP 7 .NOP \f\*[B-Font]monitor\f[] Enables the monitoring facility. See the @@ -2602,18 +2616,6 @@ The default for this flag is \f\*[B-Font]enable\f[]. .TP 7 -.NOP \f\*[B-Font]pps\f[] -Enables the pulse-per-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -"A Kernel Model for Precision Timekeeping" -(available as part of the HTML documentation -provided in -\fI/usr/share/doc/ntp\f[]) -page for further information. -The default for this flag is -\f\*[B-Font]disable\f[]. -.TP 7 .NOP \f\*[B-Font]stats\f[] Enables the statistics facility. See the @@ -2900,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5 "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.conf 5 "08 Jan 2014" "4.2.7p410" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-H2aWvy/ag-.5aWuy) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nHaaYF/ag-AHaaXF) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:35 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:04 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2928,7 +2930,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .SH "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .SH FILES @@ -3010,7 +3012,7 @@ services when they become universally available. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. This document was derived from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 5cf401bd4..ebc025ad7 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 4 2014 +.Dd January 8 2014 .Dt NTP_CONF 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:16:06 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:25 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2364,16 +2364,16 @@ otherwise, should be avoided. .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc .It Xo Ic disable .Oo .Cm auth | Cm bclient | .Cm calibrate | Cm kernel | -.Cm monitor | Cm ntp | -.Cm pps | Cm stats +.Cm mode7 | monitor | +.Cm ntp | Cm stats .Oc .Xc Provides a way to enable or disable various server options. @@ -2409,6 +2409,19 @@ flag is .Ic enable if support is available, otherwise .Ic disable . +.It Cm mode7 +Enables processing of NTP mode 7 implementation\-specific requests +which are used by the deprecated +.Xr ntpdc @NTPDC_MS@ +program. +The default for this flag is disable. +This flag is excluded from runtime configuration using +.Xr ntpq @NTPQ_MS@ . +The +.Xr ntpq @NTPQ_MS@ +program provides the same capabilities as +.Xr ntpdc @NTPDC_MS@ +using standard mode 6 requests. .It Cm monitor Enables the monitoring facility. See the @@ -2427,17 +2440,6 @@ closes the feedback loop, which is useful for testing. The default for this flag is .Ic enable . -.It Cm pps -Enables the pulse\-per\-second (PPS) signal when frequency and time is -disciplined by the precision time kernel modifications. -See the -.Qq A Kernel Model for Precision Timekeeping -(available as part of the HTML documentation -provided in -.Pa /usr/share/doc/ntp ) -page for further information. -The default for this flag is -.Ic disable . .It Cm stats Enables the statistics facility. See the @@ -2745,7 +2747,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES @@ -2807,7 +2809,7 @@ services when they become universally available. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. This document was derived from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntp.conf\fP diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index e07e90c70..d1eddecc8 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.keys 5man "08 Jan 2014" "4.2.7p410" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:48 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:09 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -157,7 +157,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP 14 .NOP \fI/etc/ntp.keys\f[] @@ -177,7 +177,7 @@ This program is released under the terms of the NTP license, .doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES @@ -167,7 +167,7 @@ This program is released under the terms of the NTP license, (dir)

This document describes the symmetric key file for the NTP Project's ntpd program. -

This document applies to version 4.2.7p409 of ntp.keys. +

This document applies to version 4.2.7p410 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 3a7ddfde8..b38e4d516 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "04 Jan 2014" "4.2.7p409" "File Formats" +.TH ntp.keys 5 "08 Jan 2014" "4.2.7p410" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:48 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:09 AM by AutoGen 5.18.3pre11 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -157,7 +157,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .SH FILES .TP 14 .NOP \fI/etc/ntp.keys\f[] @@ -177,7 +177,7 @@ This program is released under the terms of the NTP license, .doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .Sh "ENVIRONMENT" See \fBOPTION PRESETS\fP for configuration environment variables. .Sh FILES @@ -167,7 +167,7 @@ This program is released under the terms of the NTP license, [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p409"; +/* 2996 */ "ntpd 4.2.7p410"; /** * ipv4 option description with @@ -1558,7 +1558,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p409\n\ + puts(_("ntpd 4.2.7p410\n\ Copyright (C) 1970-2013 The University of Delaware, 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\ @@ -1695,7 +1695,7 @@ provided \"as is\" without express or implied warranty.\n")); puts(_("output version information and exit")); /* referenced via ntpdOptions.pzUsageTitle */ - puts(_("ntpd - NTP daemon program - Ver. 4.2.7p409\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p410\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1703,7 +1703,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p409")); + puts(_("ntpd 4.2.7p410")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 969c87c34..5ed459053 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed January 4, 2014 at 11:09:59 AM by AutoGen 5.18.3pre5 + * It has been AutoGen-ed January 8, 2014 at 11:39:00 AM by AutoGen 5.18.3pre11 * From the definitions ntpd-opts.def * and the template file options * @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.7p409" +#define NTPD_VERSION "4.2.7p410" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p409" +#define NTPD_FULL_VERSION "ntpd 4.2.7p410" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 8da54b3b4..f99d7b264 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -10,11 +10,11 @@ .ds B-Font B .ds I-Font I .ds R-Font R -.TH ntpd 1ntpdman "04 Jan 2014" "4.2.7p409" "User Commands" +.TH ntpd 1ntpdman "08 Jan 2014" "4.2.7p410" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-RmaGRz/ag-5maGQz) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-PPaWhH/ag-2PaOgH) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:53 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:13 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -434,11 +434,11 @@ by loading values from environment variables named: \fBNTPD_\fP or \fBNTPD\fP .fi .ad -.TH ntpd 1ntpdman "04 Jan 2014" "4.2.7p409" "User Commands" +.TH ntpd 1ntpdman "08 Jan 2014" "4.2.7p410" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-RmaGRz/ag-5maGQz) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-PPaWhH/ag-2PaOgH) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:15:53 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:13 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME @@ -462,7 +462,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .SH USAGE .SS "How NTP Operates" The @@ -999,7 +999,7 @@ mind. Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .SH NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. Portions of this document came from FreeBSD. .sp \n(Ppu .ne 2 diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 554c159d2..f12515fd4 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 4 2014 +.Dd January 8 2014 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 4, 2014 at 11:16:12 AM by AutoGen 5.18.3pre5 +.\" It has been AutoGen-ed January 8, 2014 at 11:43:30 AM by AutoGen 5.18.3pre11 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -393,7 +393,7 @@ test \-x "$cvt_prog" || die "'$cvt_prog' is not executable" for f in $list ; do cat $f ; echo ; done rm \-f $list } 1>.doc 2>/dev/null -sed \-f .cmds .doc | /usr/local/gnu/bin/grep \-E \-v '^[ ]*$' | $cvt_prog +sed \-f .cmds .doc | /opt/csw/bin/ggrep \-E \-v '^[ ]*$' | $cvt_prog .Sh USAGE .Ss "How NTP Operates" The @@ -895,7 +895,7 @@ mind. .Pp Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org .Sh NOTES -This document corresponds to version 4.2.7p409 of NTP. +This document corresponds to version 4.2.7p410 of NTP. Portions of this document came from FreeBSD. .Pp This manual page was \fIAutoGen\fP\-erated from the \fBntpd\fP diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index 8af8bfaf4..abe718d0f 100644 --- a/ntpd/ntpd.html +++ b/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. -

This document applies to version 4.2.7p409 of ntpd. +

This document applies to version 4.2.7p410 of ntpd.