From: Harlan Stenn Date: Fri, 22 Aug 2014 08:58:48 +0000 (+0000) Subject: NTP_4_2_7P464 X-Git-Tag: NTP_4_2_7P464^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c423023354c6840a94942cd350f5e18ff9924a;p=thirdparty%2Fntp.git NTP_4_2_7P464 bk: 53f706486l7WHDldDHsvuLfPRLnImw --- diff --git a/ChangeLog b/ChangeLog index d0c4d07f2..ac9164154 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p464) 2014/08/22 Released by Harlan Stenn * [Bug 2636] Fix coverity warning from previous patch. (4.2.7p463) 2014/08/21 Released by Harlan Stenn * [Bug 2636] Clutter in syslog if gpsd not running diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index c57b69a8c..cea4201a9 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 August 21, 2014 at 08:56:05 AM by AutoGen 5.18.4pre14 +# It has been AutoGen-ed August 22, 2014 at 08:55:45 AM by AutoGen 5.18.4pre14 # 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 ce091c9b5..20d04a062 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 August 21, 2014 at 08:56:07 AM by AutoGen 5.18.4pre14 +# It has been AutoGen-ed August 22, 2014 at 08:55:48 AM by AutoGen 5.18.4pre14 # 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 43230a578..16e840521 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 August 21, 2014 at 08:56:09 AM by AutoGen 5.18.4pre14 +# It has been AutoGen-ed August 22, 2014 at 08:55:50 AM by AutoGen 5.18.4pre14 # 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.7p463 +ntpd - NTP daemon program - Ver. 4.2.7p464 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 207700ab6..30a0e94cc 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 "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.conf 5man "22 Aug 2014" "4.2.7p464" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0Saika/ag-uTaija) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LaaaXo/ag-YaaaWo) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:51 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:33 AM by AutoGen 5.18.4pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2902,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5man "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.conf 5man "22 Aug 2014" "4.2.7p464" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0Saika/ag-uTaija) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LaaaXo/ag-YaaaWo) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:51 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:33 AM by AutoGen 5.18.4pre14 .\" 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 e5514105b..feaf80328 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd August 21 2014 +.Dd August 22 2014 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:12 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:52 AM by AutoGen 5.18.4pre14 .\" 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 aafc3d2a2..728c8f804 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.7p463 of ntp.conf. +

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

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 15c5e4034..ef7b1fb51 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 "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.conf 5 "22 Aug 2014" "4.2.7p464" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0Saika/ag-uTaija) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LaaaXo/ag-YaaaWo) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:51 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:33 AM by AutoGen 5.18.4pre14 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2902,11 +2902,11 @@ by loading values from environment variables named: \fBNTP_CONF_\fP or \fBNTP_CONF\fP .fi .ad -.TH ntp.conf 5 "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.conf 5 "22 Aug 2014" "4.2.7p464" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-0Saika/ag-uTaija) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-LaaaXo/ag-YaaaWo) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:51 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:33 AM by AutoGen 5.18.4pre14 .\" 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 3001112bb..4fb146a6c 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd August 21 2014 +.Dd August 22 2014 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:12 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:52 AM by AutoGen 5.18.4pre14 .\" 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 74d4ad821..b22d74fcd 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.keys 5man "22 Aug 2014" "4.2.7p464" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:57 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:38 AM by AutoGen 5.18.4pre14 .\" 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 8779d4772..409b1fa08 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd August 21 2014 +.Dd August 22 2014 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:15 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:56 AM by AutoGen 5.18.4pre14 .\" 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 a85208695..b7e8ab3d3 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.7p463 of ntp.keys. +

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

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index 1df9a7e33..6b84c2b5c 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "21 Aug 2014" "4.2.7p463" "File Formats" +.TH ntp.keys 5 "22 Aug 2014" "4.2.7p464" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:55:57 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:38 AM by AutoGen 5.18.4pre14 .\" 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 b5d17113c..e5bd72dc2 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd August 21 2014 +.Dd August 22 2014 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:15 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:56 AM by AutoGen 5.18.4pre14 .\" 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 8b9cdf822..455beb815 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -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.7p463\n" +/* 0 */ "ntpd 4.2.7p464\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.7p463\n" +/* 2827 */ "ntpd - NTP daemon program - Ver. 4.2.7p464\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 2960 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 2994 */ "\n\0" -/* 2996 */ "ntpd 4.2.7p463"; +/* 2996 */ "ntpd 4.2.7p464"; /** * ipv4 option description with @@ -1558,7 +1558,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.2.7p463\n\ + puts(_("ntpd 4.2.7p464\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\ @@ -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.7p463\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.2.7p464\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1703,7 +1703,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.2.7p463")); + puts(_("ntpd 4.2.7p464")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 07343e0b1..3686aa999 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -105,9 +105,9 @@ typedef enum { /** count of all options for ntpd */ #define OPTION_CT 37 /** ntpd version */ -#define NTPD_VERSION "4.2.7p463" +#define NTPD_VERSION "4.2.7p464" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.2.7p463" +#define NTPD_FULL_VERSION "ntpd 4.2.7p464" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index b3675afc1..90cd00e85 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 "21 Aug 2014" "4.2.7p463" "User Commands" +.TH ntpd 1ntpdman "22 Aug 2014" "4.2.7p464" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-faaGKb/ag-raaGJb) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Vcaihq/ag-7caigq) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:00 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:41 AM by AutoGen 5.18.4pre14 .\" 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 "21 Aug 2014" "4.2.7p463" "User Commands" +.TH ntpd 1ntpdman "22 Aug 2014" "4.2.7p464" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-faaGKb/ag-raaGJb) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-Vcaihq/ag-7caigq) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:00 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:41 AM by AutoGen 5.18.4pre14 .\" 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 b3178bd0a..e7c346163 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd August 21 2014 +.Dd August 22 2014 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed August 21, 2014 at 08:56:17 AM by AutoGen 5.18.4pre14 +.\" It has been AutoGen-ed August 22, 2014 at 08:55:58 AM by AutoGen 5.18.4pre14 .\" 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 24448ad59..6ef98a8eb 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.7p463 of ntpd. +

This document applies to version 4.2.7p464 of ntpd.