From: Harlan Stenn Date: Wed, 1 Jul 2015 11:59:28 +0000 (+0000) Subject: NTP_4_3_50 X-Git-Tag: NTP_4_3_50^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee90dbb287fc246b2e61d25c71e8a786915f86b2;p=thirdparty%2Fntp.git NTP_4_3_50 bk: 5593d620T0HkIL-2l0slmcED3xNlrA --- diff --git a/ChangeLog b/ChangeLog index 0ebb04650..542d71c1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.50) 2015/07/01 Released by Harlan Stenn (4.3.49) 2015/06/30 Released by Harlan Stenn Below are from 4.2.8p3: * [Bug 2846] Report 'unsynchronized' status during the leap second. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 9464cecd7..4a667249f 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 June 30, 2015 at 11:57:56 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 1, 2015 at 11:57:16 AM by AutoGen 5.18.5 # 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 fbd56f2ac..2164625fe 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 June 30, 2015 at 11:57:59 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 1, 2015 at 11:57:19 AM by AutoGen 5.18.5 # 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 892d0820a..cc8df1b3d 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 June 30, 2015 at 11:58:01 AM by AutoGen 5.18.5 +# It has been AutoGen-ed July 1, 2015 at 11:57:21 AM 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.3.49 +ntpd - NTP daemon program - Ver. 4.3.50 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index be636e9ec..b9b04e48d 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 "30 Jun 2015" "4.3.49" "File Formats" +.TH ntp.conf 5man "01 Jul 2015" "4.3.50" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vRaWlF/ag-HRaOkF) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-ZJaad0/ag-_Ja4b0) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:57:44 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:03 AM by AutoGen 5.18.5 .\" 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 4e51ded46..9dbd54fdf 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd June 30 2015 +.Dd July 1 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:58:04 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:23 AM by AutoGen 5.18.5 .\" 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 1c27669a5..1e814fcde 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.3.49 of ntp.conf. +

This document applies to version 4.3.50 of ntp.conf.

Short Contents

@@ -2286,6 +2286,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. +
dscp value
This option specifies the Differentiated Services Control Point (DSCP) value, +a 6-bit code. The default value is 46, signifying Expedited Forwarding.
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats]
Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags @@ -2360,6 +2362,18 @@ This option is useful for sites that run ntpd(1ntpdmdoc) on multiple hosts, with (mostly) common options (e.g., a restriction list). +
leapsmearinterval seconds
This EXPERIMENTAL option is only available if +ntpd(1ntpdmdoc) +was built with the +--enable-leap-smear +option to the +configure +script. +It specifies the interval over which a leap second correction will be applied. +Recommended values for this option are between +7200 (2 hours) and 86400 (24 hours). +.Sy DO NOT USE THIS OPTION ON PUBLIC-ACCESS SERVERS! +See http://bugs.ntp.org/2855 for more information.
logconfig configkeyword
This command controls the amount and type of output written to the system syslog(3) diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 654a8e184..c7637d438 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 "30 Jun 2015" "4.3.49" "File Formats" +.TH ntp.conf 5 "01 Jul 2015" "4.3.50" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-vRaWlF/ag-HRaOkF) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-ZJaad0/ag-_Ja4b0) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:57:44 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:03 AM by AutoGen 5.18.5 .\" 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 6af9529c9..fa95a69f6 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 30 2015 +.Dd July 1 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:58:04 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:23 AM by AutoGen 5.18.5 .\" 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 11528cb07..7de14686e 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "30 Jun 2015" "4.3.49" "File Formats" +.TH ntp.keys 5man "01 Jul 2015" "4.3.50" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:57:48 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:08 AM by AutoGen 5.18.5 .\" 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 c30d078c7..6f0cbc81c 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd June 30 2015 +.Dd July 1 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:58:08 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:27 AM by AutoGen 5.18.5 .\" 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 70f5675a4..4ff232953 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.3.49 of ntp.keys. +

This document applies to version 4.3.50 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 02161408f..07d6752f0 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "30 Jun 2015" "4.3.49" "File Formats" +.TH ntp.keys 5 "01 Jul 2015" "4.3.50" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:57:48 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:08 AM by AutoGen 5.18.5 .\" 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 9532f0384..58269ff40 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd June 30 2015 +.Dd July 1 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:58:08 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:27 AM by AutoGen 5.18.5 .\" 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 de2c8454e..074faba10 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 June 30, 2015 at 11:55:45 AM by AutoGen 5.18.5 + * It has been AutoGen-ed July 1, 2015 at 11:55:06 AM 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[3126] = -/* 0 */ "ntpd 4.3.49\n" +/* 0 */ "ntpd 4.3.50\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[3126] = /* 2899 */ "output version information and exit\0" /* 2935 */ "version\0" /* 2943 */ "NTPD\0" -/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.49\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.50\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.49"; +/* 3114 */ "ntpd 4.3.50"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.49\n\ + puts(_("ntpd 4.3.50\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.3.49\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.50\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.49")); + puts(_("ntpd 4.3.50")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index bcc531f90..9417a1dc1 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 June 30, 2015 at 11:55:44 AM by AutoGen 5.18.5 + * It has been AutoGen-ed July 1, 2015 at 11:55:05 AM 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.3.49" +#define NTPD_VERSION "4.3.50" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.49" +#define NTPD_FULL_VERSION "ntpd 4.3.50" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index ef95a1ca7..45c927641 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 "30 Jun 2015" "4.3.49" "User Commands" +.TH ntpd 1ntpdman "01 Jul 2015" "4.3.50" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-BTaiFG/ag-NTaaEG) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pKayw1/ag-BKaqv1) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:57:52 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:11 AM by AutoGen 5.18.5 .\" 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 6e7f56ab5..8973cf403 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd June 30 2015 +.Dd July 1 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed June 30, 2015 at 11:58:09 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed July 1, 2015 at 11:57:29 AM by AutoGen 5.18.5 .\" 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 3b1c9ecd7..6447105a1 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.3.49 of ntpd. +

This document applies to version 4.3.50 of ntpd.