From: Harlan Stenn Date: Sat, 3 Jan 2015 04:07:47 +0000 (-0500) Subject: NTP_4_2_8P1_BETA3 X-Git-Tag: NTP_4_2_8P1_BETA3^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeffe25936d3343eeb012ead030a8fcac6a85cd7;p=thirdparty%2Fntp.git NTP_4_2_8P1_BETA3 bk: 54a76b13nBKcLuJq8j2qUtKDIqtLmQ --- diff --git a/ChangeLog b/ChangeLog index dee3be68e..afd18dae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.8p1-beta3) 2015/01/02 Released by Harlan Stenn * [Bug 2627] shm refclock allows only two units with owner-only access Use mode bit 0 to select public access for units >= 2 (units 0 & 1 are diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 53f4ebf35..55e795aea 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 December 27, 2014 at 06:31:05 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 2, 2015 at 11:05:21 PM by AutoGen 5.18.5pre4 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -365,6 +365,20 @@ in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in @ref{Authentication Options}. +@item @code{mdnstries} @kbd{number} +If we are participating in mDNS, +after we have synched for the first time +we attempt to register with the mDNS system. +If that registration attempt fails, +we try again at one minute intervals for up to +@code{mdnstries} +times. +After all, +@code{ntpd} +may be starting before mDNS. +The default value for +@code{mdnstries} +is 5. @end table @node Authentication Support @subsection Authentication Support diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 3431a54cb..5770570a3 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 December 27, 2014 at 06:31:07 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 2, 2015 at 11:05:25 PM by AutoGen 5.18.5pre4 # 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 25e14b4fb..dce2d8705 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 December 27, 2014 at 06:31:09 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed January 2, 2015 at 11:05:27 PM by AutoGen 5.18.5pre4 # 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.8p1-beta2 +ntpd - NTP daemon program - Ver. 4.2.8p1-beta3 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 0883b7963..7ac232e77 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 "27 Dec 2014" "4.2.8p1-beta2" "File Formats" +.TH ntp.conf 5man "02 Jan 2015" "4.2.8p1-beta3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fGaaGa/ag-rGa4Ea) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-UBaa2Y/ag-7Ba40Y) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:30:52 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:08 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -415,6 +415,21 @@ in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in \fIAuthentication\f[] \fIOptions\f[]. +.TP 7 +.NOP \f\*[B-Font]mdnstries\f[] \f\*[I-Font]number\f[] +If we are participating in mDNS, +after we have synched for the first time +we attempt to register with the mDNS system. +If that registration attempt fails, +we try again at one minute intervals for up to +\f\*[B-Font]mdnstries\f[] +times. +After all, +\f\*[B-Font]ntpd\f[] +may be starting before mDNS. +The default value for +\f\*[B-Font]mdnstries\f[] +is 5. .PP .SH Authentication Support Authentication support allows the NTP client to verify that the diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 516be291a..14a96f1ee 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd December 27 2014 +.Dd January 2 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:12 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:29 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -402,6 +402,20 @@ in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . +.It Ic mdnstries Ar number +If we are participating in mDNS, +after we have synched for the first time +we attempt to register with the mDNS system. +If that registration attempt fails, +we try again at one minute intervals for up to +.Ic mdnstries +times. +After all, +.Ic ntpd +may be starting before mDNS. +The default value for +.Ic mdnstries +is 5. .El .Sh Authentication Support Authentication support allows the NTP client to verify that the diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 825c4de6a..af8d0e6bb 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.8p1-beta2 of ntp.conf. +

This document applies to version 4.2.8p1-beta3 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 5c793a98c..290f9d997 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 "27 Dec 2014" "4.2.8p1-beta2" "File Formats" +.TH ntp.conf 5 "02 Jan 2015" "4.2.8p1-beta3" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fGaaGa/ag-rGa4Ea) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-UBaa2Y/ag-7Ba40Y) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:30:52 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:08 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -415,6 +415,21 @@ in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric-key or public-key authentication as described in \fIAuthentication\f[] \fIOptions\f[]. +.TP 7 +.NOP \f\*[B-Font]mdnstries\f[] \f\*[I-Font]number\f[] +If we are participating in mDNS, +after we have synched for the first time +we attempt to register with the mDNS system. +If that registration attempt fails, +we try again at one minute intervals for up to +\f\*[B-Font]mdnstries\f[] +times. +After all, +\f\*[B-Font]ntpd\f[] +may be starting before mDNS. +The default value for +\f\*[B-Font]mdnstries\f[] +is 5. .PP .SH Authentication Support Authentication support allows the NTP client to verify that the diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 7a9c20e0f..f49fd37f0 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 27 2014 +.Dd January 2 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:12 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:29 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -402,6 +402,20 @@ in order to avoid accidental or malicious disruption in this mode, both the server and client should operate using symmetric\-key or public\-key authentication as described in .Sx Authentication Options . +.It Ic mdnstries Ar number +If we are participating in mDNS, +after we have synched for the first time +we attempt to register with the mDNS system. +If that registration attempt fails, +we try again at one minute intervals for up to +.Ic mdnstries +times. +After all, +.Ic ntpd +may be starting before mDNS. +The default value for +.Ic mdnstries +is 5. .El .Sh Authentication Support Authentication support allows the NTP client to verify that the diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 7659bd288..683e34a05 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "27 Dec 2014" "4.2.8p1-beta2" "File Formats" +.TH ntp.keys 5man "02 Jan 2015" "4.2.8p1-beta3" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:30:57 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:13 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc index 94cd78e6f..a5732059e 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd December 27 2014 +.Dd January 2 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:15 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:33 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.html b/ntpd/ntp.keys.html index f6c71cd6e..ca0d33f43 100644 --- a/ntpd/ntp.keys.html +++ b/ntpd/ntp.keys.html @@ -33,7 +33,7 @@ Up: (dir)

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

This document applies to version 4.2.8p1-beta2 of ntp.keys. +

This document applies to version 4.2.8p1-beta3 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 38af35203..e235a71f7 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "27 Dec 2014" "4.2.8p1-beta2" "File Formats" +.TH ntp.keys 5 "02 Jan 2015" "4.2.8p1-beta3" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:30:57 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:13 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in index 041a4100d..f39e48899 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd December 27 2014 +.Dd January 2 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:15 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:33 PM by AutoGen 5.18.5pre4 .\" From the definitions ntp.keys.def .\" and the template file agmdoc-file.tpl .Sh NAME diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 1faca30ae..8547ffb23 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed December 27, 2014 at 06:28:31 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 2, 2015 at 11:02:40 PM by AutoGen 5.18.5pre4 * 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[3023] = -/* 0 */ "ntpd 4.2.8p1-beta2\n" +/* 0 */ "ntpd 4.2.8p1-beta3\n" "Copyright (C) 1970-2014 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" @@ -201,12 +201,12 @@ static char const ntpd_opt_strs[3023] = /* 2782 */ "output version information and exit\0" /* 2818 */ "version\0" /* 2826 */ "NTPD\0" -/* 2831 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-beta2\n" +/* 2831 */ "ntpd - NTP daemon program - Ver. 4.2.8p1-beta3\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2968 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3002 */ "\n\0" -/* 3004 */ "ntpd 4.2.8p1-beta2"; +/* 3004 */ "ntpd 4.2.8p1-beta3"; /** * ipv4 option description with @@ -1501,7 +1501,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.8p1-beta2\n\ + puts(_("ntpd 4.2.8p1-beta3\n\ Copyright (C) 1970-2014 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\ @@ -1638,7 +1638,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.8p1-beta2\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.8p1-beta3\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1646,7 +1646,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.8p1-beta2")); + puts(_("ntpd 4.2.8p1-beta3")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index fbc45ee89..48b39ff63 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 December 27, 2014 at 06:28:30 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed January 2, 2015 at 11:02:39 PM by AutoGen 5.18.5pre4 * 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.8p1-beta2" +#define NTPD_VERSION "4.2.8p1-beta3" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.8p1-beta2" +#define NTPD_FULL_VERSION "ntpd 4.2.8p1-beta3" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 37632983c..ff7d03363 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 "27 Dec 2014" "4.2.8p1-beta2" "User Commands" +.TH ntpd 1ntpdman "02 Jan 2015" "4.2.8p1-beta3" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-XHaW4b/ag-9Hai3b) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-uFaOj0/ag-HFaGi0) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:00 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:16 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index e7765111d..bfacc3cf7 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd December 27 2014 +.Dd January 2 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed December 27, 2014 at 06:31:17 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed January 2, 2015 at 11:05:35 PM by AutoGen 5.18.5pre4 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html index ddf81f8e3..754042b2c 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.8p1-beta2 of ntpd. +

This document applies to version 4.2.8p1-beta3 of ntpd.