From: Harlan Stenn Date: Wed, 30 Sep 2015 11:59:54 +0000 (+0000) Subject: NTP_4_3_74 X-Git-Tag: NTP_4_3_74^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3547abb2a6e7af6c7531e85592de71feec3ea8f;p=thirdparty%2Fntp.git NTP_4_3_74 bk: 560bceba2L8czwKdRD2C3dPuz09vdQ --- diff --git a/ChangeLog b/ChangeLog index 4ff6050fd..c604f582a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.74) 2015/09/30 Released by Harlan Stenn Below are from 4.2.8p4: * [Bug 2332] (reopened) Exercise thread cancellation once before dropping privileges and limiting resources in NTPD removes the need to link diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index 2e3580887..05f537f26 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 29, 2015 at 12:13:42 PM by AutoGen 5.18.5 +# It has been AutoGen-ed September 30, 2015 at 11:57:35 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 caf4e9aa8..c76c6574c 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 29, 2015 at 12:13:45 PM by AutoGen 5.18.5 +# It has been AutoGen-ed September 30, 2015 at 11:57:38 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 4a777de14..b907ee3c5 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 29, 2015 at 12:13:47 PM by AutoGen 5.18.5 +# It has been AutoGen-ed September 30, 2015 at 11:57:40 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.73 +ntpd - NTP daemon program - Ver. 4.3.74 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index 5a08f246f..77e9559c7 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 "29 Sep 2015" "4.3.73" "File Formats" +.TH ntp.conf 5man "30 Sep 2015" "4.3.74" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eVaGMc/ag-qVayLc) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-uxaiLP/ag-GxaaKP) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:29 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:22 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 d7b0b818b..11ca40be8 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd September 29 2015 +.Dd September 30 2015 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:50 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:43 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 e5dd5b673..b36421f84 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.73 of ntp.conf. +

This document applies to version 4.3.74 of ntp.conf.

Short Contents

@@ -2546,12 +2546,15 @@ pulses will not be suppressed.
rlimit [memlock Nmegabytes | stacksize N4kPages filenum Nfiledescriptors]
-
memlock Nmegabytes
Specify the number of megabytes of memory that can be allocated. -Probably only available under Linux, this option is useful +
memlock Nmegabytes
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 -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".
stacksize N4kPages
Specifies the maximum size of the process stack on systems with the mlockall() function. diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index 20ebffa6d..f26bab48f 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 "29 Sep 2015" "4.3.73" "File Formats" +.TH ntp.conf 5 "30 Sep 2015" "4.3.74" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-eVaGMc/ag-qVayLc) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-uxaiLP/ag-GxaaKP) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:29 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:22 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 969caa63f..f90dcca65 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd September 29 2015 +.Dd September 30 2015 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:50 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:43 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 148b6b69d..94d5dc3b1 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "29 Sep 2015" "4.3.73" "File Formats" +.TH ntp.keys 5man "30 Sep 2015" "4.3.74" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:34 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:27 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 545d98ca8..49adee411 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd September 29 2015 +.Dd September 30 2015 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed September 29, 2015 at 12:13:54 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed September 30, 2015 at 11:57:46 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 e28169237..f31de98c2 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.73 of ntp.keys. +

This document applies to version 4.3.74 of ntp.keys.

Short Contents

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

This document applies to version 4.3.74 of ntpd.