From: Harlan Stenn Date: Thu, 13 Nov 2014 09:01:17 +0000 (+0000) Subject: NTP_4_2_7P477 X-Git-Tag: NTP_4_2_7P477^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bf002fdadf5b81ba31f64aa6fc1fe1aeebeb58;p=thirdparty%2Fntp.git NTP_4_2_7P477 bk: 5464735dvB0WHyPi2zOYdCiGNLbLeg --- diff --git a/ChangeLog b/ChangeLog index dbe24255a..41c568ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p477) 2014/11/13 Released by Harlan Stenn * [Bug 2657] Document that "restrict nopeer" intereferes with "pool". (4.2.7p476) 2014/10/08 Released by Harlan Stenn * [Bug 2503] SHT utility outdated diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index d867d87f3..d850903cb 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 November 12, 2014 at 06:22:25 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed November 13, 2014 at 08:58:10 AM by AutoGen 5.18.5pre4 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index be8986dd0..b4c432ae2 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 October 8, 2014 at 09:33:52 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed November 13, 2014 at 08:58:14 AM 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 dc696bb8b..88dd5fb90 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 October 8, 2014 at 09:33:54 AM by AutoGen 5.18.5pre4 +# It has been AutoGen-ed November 13, 2014 at 08:58:16 AM 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.7p476 +ntpd - NTP daemon program - Ver. 4.2.7p477 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 4aa61c658..76fe43007 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 "12 Nov 2014" "4.2.7p476" "File Formats" +.TH ntp.conf 5man "13 Nov 2014" "4.2.7p477" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (in-mem file) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-REa4MM/ag-3EaWLM) .\" -.\" It has been AutoGen-ed November 12, 2014 at 06:22:28 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:57:57 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 947d99c99..f62b0c377 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd November 12 2014 +.Dd November 13 2014 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 12, 2014 at 06:22:18 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:19 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 4ba9270b9..1da0a35ec 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.7p476 of ntp.conf. +

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

Short Contents

@@ -1512,6 +1512,17 @@ Time service is not affected. This includes broadcast and symmetric active packets when a configured association does not exist. +It also includes +pool +associations, so if you want to use servers from a +pool +directive and also want to use +nopeer +by default, you'll want a +restrict source ... line as well that does +
not
include the +nopeer +directive.
noserve
Deny all packets except ntpq(1ntpqmdoc) and diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 05c480c2b..89878ab35 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 "12 Nov 2014" "4.2.7p476" "File Formats" +.TH ntp.conf 5 "13 Nov 2014" "4.2.7p477" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (in-mem file) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-REa4MM/ag-3EaWLM) .\" -.\" It has been AutoGen-ed November 12, 2014 at 06:22:28 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:57:57 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 71c830c4d..efd57fe7c 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd November 12 2014 +.Dd November 13 2014 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed November 12, 2014 at 06:22:18 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:19 AM by AutoGen 5.18.5pre4 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index e7a54c549..3c39de473 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "08 Oct 2014" "4.2.7p476" "File Formats" +.TH ntp.keys 5man "13 Nov 2014" "4.2.7p477" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:33:42 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:02 AM 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 6287b2b2c..ae7d62347 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd October 8 2014 +.Dd November 13 2014 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:34:00 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:22 AM 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 7d10425f9..2ef2cfae9 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.7p476 of ntp.keys. +

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

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 67c7618fe..52e250e89 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "08 Oct 2014" "4.2.7p476" "File Formats" +.TH ntp.keys 5 "13 Nov 2014" "4.2.7p477" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:33:42 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:02 AM 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 c8ee8e704..7188c1e5c 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd October 8 2014 +.Dd November 13 2014 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:34:00 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:22 AM 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 47ca7d1e7..cbad29c14 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 October 8, 2014 at 09:31:17 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed November 13, 2014 at 08:55:33 AM 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[3011] = -/* 0 */ "ntpd 4.2.7p476\n" +/* 0 */ "ntpd 4.2.7p477\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[3011] = /* 2778 */ "output version information and exit\0" /* 2814 */ "version\0" /* 2822 */ "NTPD\0" -/* 2827 */ "ntpd - NTP daemon program - Ver. 4.2.7p476\n" +/* 2827 */ "ntpd - NTP daemon program - Ver. 4.2.7p477\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p476"; +/* 2996 */ "ntpd 4.2.7p477"; /** * ipv4 option description with @@ -1501,7 +1501,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p476\n\ + puts(_("ntpd 4.2.7p477\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.7p476\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p477\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1646,7 +1646,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p476")); + puts(_("ntpd 4.2.7p477")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 3893c7b94..cfd2b52c3 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 October 8, 2014 at 09:31:16 AM by AutoGen 5.18.5pre4 + * It has been AutoGen-ed November 13, 2014 at 08:55:32 AM 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.7p476" +#define NTPD_VERSION "4.2.7p477" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p476" +#define NTPD_FULL_VERSION "ntpd 4.2.7p477" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index c68ec308c..356fc3bac 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 "08 Oct 2014" "4.2.7p476" "User Commands" +.TH ntpd 1ntpdman "13 Nov 2014" "4.2.7p477" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-B_a4DF/ag-O_aWCF) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0OaG6N/ag-aPay5N) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:33:45 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:06 AM 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 ce12b5552..09112cc50 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd October 8 2014 +.Dd November 13 2014 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed October 8, 2014 at 09:34:02 AM by AutoGen 5.18.5pre4 +.\" It has been AutoGen-ed November 13, 2014 at 08:58:24 AM 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 bbd3089ac..fc780e6dc 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.7p476 of ntpd. +

This document applies to version 4.2.7p477 of ntpd.