From: Harlan Stenn Date: Tue, 29 Sep 2015 12:16:03 +0000 (+0000) Subject: NTP_4_3_73 X-Git-Tag: NTP_4_3_73^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a05120d905f3fd35948e8197ec050f3216c75a;p=thirdparty%2Fntp.git NTP_4_3_73 bk: 560a8103twNRi3P-RAk5boHNcJaLqg --- diff --git a/ChangeLog b/ChangeLog index fdf0922e4..1abde2787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.73) 2015/09/29 Released by Harlan Stenn Below are from 4.2.8p4: * More updates for bug 2817. Harlan Stenn. * Fix bugs in tests/ntpd/ntp_prio_q.c. Harlan Stenn. diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 33a8a5a0d..2e3580887 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 September 21, 2015 at 11:57:44 AM by AutoGen 5.18.5 +# It has been AutoGen-ed September 29, 2015 at 12:13:42 PM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -2578,12 +2578,15 @@ pulses will not be suppressed. @item @code{rlimit} @code{[@code{memlock} @kbd{Nmegabytes} | @code{stacksize} @kbd{N4kPages} @code{filenum} @kbd{Nfiledescriptors}]} @table @asis @item @code{memlock} @kbd{Nmegabytes} -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the @code{-i} option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and -1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". @item @code{stacksize} @kbd{N4kPages} Specifies the maximum size of the process stack on systems with the @code{mlockall()} diff --git a/ntpd/invoke-ntp.keys.texi b/ntpd/invoke-ntp.keys.texi index 95f4abeb1..caf4e9aa8 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 September 21, 2015 at 11:57:47 AM by AutoGen 5.18.5 +# It has been AutoGen-ed September 29, 2015 at 12:13:45 PM 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 57370aaa4..4a777de14 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 September 21, 2015 at 11:57:49 AM by AutoGen 5.18.5 +# It has been AutoGen-ed September 29, 2015 at 12:13:47 PM 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.72 +ntpd - NTP daemon program - Ver. 4.3.73 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index e6b1ade15..5a08f246f 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 Sep 2015" "4.3.72" "File Formats" +.TH ntp.conf 5man "29 Sep 2015" "4.3.73" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fZaagu/ag-sZa4eu) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eVaGMc/ag-qVayLc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:31 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:29 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2897,12 +2897,15 @@ pulses will not be suppressed. .RS .TP 7 .NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[] -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the \f\*[B-Font]\-i\f[] option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc index 575605128..d7b0b818b 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd September 21 2015 +.Dd September 29 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:52 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:50 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2725,12 +2725,15 @@ pulses will not be suppressed. .Xc .Bl -tag -width indent .It Cm memlock Ar Nmegabytes -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the .Fl i option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non\-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the .Fn mlockall diff --git a/ntpd/ntp.conf.html b/ntpd/ntp.conf.html index 42392ef62..e5dd5b673 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.72 of ntp.conf. +

This document applies to version 4.3.73 of ntp.conf.

Short Contents

diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 0b1ae1fc2..20ebffa6d 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 Sep 2015" "4.3.72" "File Formats" +.TH ntp.conf 5 "29 Sep 2015" "4.3.73" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-fZaagu/ag-sZa4eu) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eVaGMc/ag-qVayLc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:31 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:29 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agman-cmd.tpl .SH NAME @@ -2897,12 +2897,15 @@ pulses will not be suppressed. .RS .TP 7 .NOP \f\*[B-Font]memlock\f[] \f\*[I-Font]Nmegabytes\f[] -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the \f\*[B-Font]\-i\f[] option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .TP 7 .NOP \f\*[B-Font]stacksize\f[] \f\*[I-Font]N4kPages\f[] Specifies the maximum size of the process stack on systems with the diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in index 9ae426b0e..969caa63f 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd September 21 2015 +.Dd September 29 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:52 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:50 PM by AutoGen 5.18.5 .\" From the definitions ntp.conf.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -2725,12 +2725,15 @@ pulses will not be suppressed. .Xc .Bl -tag -width indent .It Cm memlock Ar Nmegabytes -Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +Specify the number of megabytes of memory that should be +allocated and locked. +Probably only available under Linux, this option may be useful when dropping root (the .Fl i option). -The default is 32 megabytes. Setting this to zero will prevent any attemp to lock memory. +The default is 32 megabytes on non\-Linux machines, and \-1 under Linux. +-1 means "do not lock the process into memory". +0 means "lock whatever memory the process wants into memory". .It Cm stacksize Ar N4kPages Specifies the maximum size of the process stack on systems with the .Fn mlockall diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man index 0e1109896..148b6b69d 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "21 Sep 2015" "4.3.72" "File Formats" +.TH ntp.keys 5man "29 Sep 2015" "4.3.73" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:36 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:34 PM 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 ebf4611ea..545d98ca8 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd September 21 2015 +.Dd September 29 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:55 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:54 PM 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 c20373268..e28169237 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.72 of ntp.keys. +

This document applies to version 4.3.73 of ntp.keys.

Short Contents

diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index e6da00271..a642ac40b 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "21 Sep 2015" "4.3.72" "File Formats" +.TH ntp.keys 5 "29 Sep 2015" "4.3.73" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:36 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:34 PM 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 f18def3c4..bddde84cd 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd September 21 2015 +.Dd September 29 2015 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:55 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:54 PM 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 46f2bc0e9..20066dea1 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 September 21, 2015 at 11:55:29 AM by AutoGen 5.18.5 + * It has been AutoGen-ed September 29, 2015 at 12:11:30 PM 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.72\n" +/* 0 */ "ntpd 4.3.73\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.72\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.73\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.72"; +/* 3114 */ "ntpd 4.3.73"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.72\n\ + puts(_("ntpd 4.3.73\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.72\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.73\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.72")); + puts(_("ntpd 4.3.73")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 6c6b94416..b0025b88a 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 September 21, 2015 at 11:55:28 AM by AutoGen 5.18.5 + * It has been AutoGen-ed September 29, 2015 at 12:11:28 PM 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.72" +#define NTPD_VERSION "4.3.73" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.72" +#define NTPD_FULL_VERSION "ntpd 4.3.73" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 6d57aacef..ae1bd9b55 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 Sep 2015" "4.3.72" "User Commands" +.TH ntpd 1ntpdman "29 Sep 2015" "4.3.73" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-N7ayzv/ag-07aqyv) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-h3a45d/ag-t3aW4d) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:40 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:38 PM 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 8102a2dbb..689b6e53d 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd September 21 2015 +.Dd September 29 2015 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed September 21, 2015 at 11:57:57 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 29, 2015 at 12:13:55 PM 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 995ddaaf3..e9be8c8ee 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.72 of ntpd. +

This document applies to version 4.3.73 of ntpd.