From: Harlan Stenn Date: Sun, 24 Jan 2016 12:06:39 +0000 (+0000) Subject: NTP_4_3_91 X-Git-Tag: NTP_4_3_91^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b58e475647af80508d50f8b6b52284e2027e622;p=thirdparty%2Fntp.git NTP_4_3_91 bk: 56a4be4fuPiOc0H3_8eDl1Hrt5DcQw --- diff --git a/ChangeLog b/ChangeLog index 9fb39d5d3..726f2f13e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.3.91) 2016/01/24 Released by Harlan Stenn From ntp-4.2.8p7: * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org * [Bug 2995] Fixes to compile on Windows diff --git a/ntpd/invoke-ntp.conf.texi b/ntpd/invoke-ntp.conf.texi index c1468dc80..5859ed145 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 January 20, 2016 at 11:59:02 AM by AutoGen 5.18.5 +# It has been AutoGen-ed January 24, 2016 at 12:04:08 PM 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 02032f2b7..5dccad1fd 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 January 20, 2016 at 11:59:05 AM by AutoGen 5.18.5 +# It has been AutoGen-ed January 24, 2016 at 12:04:11 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 ec4fc60a3..396a14b60 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 January 20, 2016 at 11:59:07 AM by AutoGen 5.18.5 +# It has been AutoGen-ed January 24, 2016 at 12:04:13 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.90 +ntpd - NTP daemon program - Ver. 4.3.91 Usage: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man index a59a65517..e3a4ca13e 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 "20 Jan 2016" "4.3.90" "File Formats" +.TH ntp.conf 5man "24 Jan 2016" "4.3.91" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pSa4RQ/ag-BSaWQQ) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-sdaqBh/ag-FdaiAh) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:58:49 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:03:54 PM 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 851075689..67af60038 100644 --- a/ntpd/ntp.conf.5mdoc +++ b/ntpd/ntp.conf.5mdoc @@ -1,9 +1,9 @@ -.Dd January 20 2016 +.Dd January 24 2016 .Dt NTP_CONF 5mdoc File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:59:10 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:16 PM 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 2355e89a7..84529e782 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.90 of ntp.conf. +

This document applies to version 4.3.91 of ntp.conf.

Short Contents

@@ -2288,7 +2288,7 @@ 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. +
enable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats | unpeer_crypto_early | unpeer_crypto_nak_early | unpeer_digest_early]
disable [auth | bclient | calibrate | kernel | mode7 | monitor | ntp | stats | unpeer_crypto_early | unpeer_crypto_nak_early | unpeer_digest_early]
Provides a way to enable or disable various server options. Flags not mentioned are unaffected. Note that all of these flags can be controlled remotely using the @@ -2351,6 +2351,64 @@ See the section for further information. The default for this flag is disable. +
unpeer_crypto_early
By default, if +ntpd(1ntpdmdoc) +receives an autokey packet that fails TEST9, +a crypto failure, +the association is immediately cleared. +This is almost certainly a feature, +but if, in spite of the current recommendation of not using autokey, +you are +.B still +using autokey +.B and +you are seeing this sort of DoS attack +disabling this flag will delay +tearing down the association until the reachability counter +becomes zero. +You can check your +peerstats +file for evidence of any of these attacks. +The +default for this flag is +enable. +
unpeer_crypto_nak_early
By default, if +ntpd(1ntpdmdoc) +receives a crypto-NAK packet that +passes the duplicate packet and origin timestamp checks +the association is immediately cleared. +While this is generally a feature +as it allows for quick recovery if a server key has changed, +a properly forged and appropriately delivered crypto-NAK packet +can be used in a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +peerstats +file for evidence of any of these attacks. +The +default for this flag is +enable. +
unpeer_digest_early
By default, if +ntpd(1ntpdmdoc) +receives what should be an authenticated packet +that passes other packet sanity checks but +contains an invalid digest +the association is immediately cleared. +While this is generally a feature +as it allows for quick recovery, +if this type of packet is carefully forged and sent +during an appropriate window it can be used for a DoS attack. +If you have active noticable problems with this type of DoS attack +then you should consider +disabling this option. +You can check your +peerstats +file for evidence of any of these attacks. +The +default for this flag is +enable.
includefile includefile
This command allows additional configuration commands to be included from a separate file. diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in index d8c58a9a0..296859829 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 "20 Jan 2016" "4.3.90" "File Formats" +.TH ntp.conf 5 "24 Jan 2016" "4.3.91" "File Formats" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-pSa4RQ/ag-BSaWQQ) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-sdaqBh/ag-FdaiAh) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:58:49 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:03:54 PM 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 dbc9af4a6..f99c661b0 100644 --- a/ntpd/ntp.conf.mdoc.in +++ b/ntpd/ntp.conf.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 20 2016 +.Dd January 24 2016 .Dt NTP_CONF 5 File Formats .Os .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:59:10 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:16 PM 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 6e03bec57..ba2bc31bd 100644 --- a/ntpd/ntp.keys.5man +++ b/ntpd/ntp.keys.5man @@ -1,8 +1,8 @@ -.TH ntp.keys 5man "20 Jan 2016" "4.3.90" "File Formats" +.TH ntp.keys 5man "24 Jan 2016" "4.3.91" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:58:54 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:00 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 2d799a0f7..7dfacb621 100644 --- a/ntpd/ntp.keys.5mdoc +++ b/ntpd/ntp.keys.5mdoc @@ -1,9 +1,9 @@ -.Dd January 20 2016 +.Dd January 24 2016 .Dt NTP_KEYS 5mdoc File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:59:14 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:19 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 0e690c792..7a5da5b13 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.90 of ntp.keys. +

This document applies to version 4.3.91 of ntp.keys.

Short Contents

@@ -93,7 +93,7 @@ may be arbitrarily set in the keys file. as the configuration file. Key entries use a fixed format of the form -
     keyno type key
+
     keyno type key opt_IP_list
 

where keyno @@ -102,7 +102,15 @@ is a positive integer (between 1 and 65534), is the message digest algorithm, and key -is the key itself. +is the key itself, and +opt_IP_list +is an optional comma-separated list of IPs +that are allowed to serve time. +If +opt_IP_list +is empty, +any properly-authenticated server message will be +accepted.

The key diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in index a0c4cda41..79949811a 100644 --- a/ntpd/ntp.keys.man.in +++ b/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "20 Jan 2016" "4.3.90" "File Formats" +.TH ntp.keys 5 "24 Jan 2016" "4.3.91" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:58:54 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:00 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 922718350..5d84e155b 100644 --- a/ntpd/ntp.keys.mdoc.in +++ b/ntpd/ntp.keys.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 20 2016 +.Dd January 24 2016 .Dt NTP_KEYS 5 File Formats .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntp.mdoc) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:59:14 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:19 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 33da037a8..6b788f64d 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 January 20, 2016 at 11:56:50 AM by AutoGen 5.18.5 + * It has been AutoGen-ed January 24, 2016 at 12:01:51 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.90\n" +/* 0 */ "ntpd 4.3.91\n" "Copyright (C) 1992-2016 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.90\n" +/* 2948 */ "ntpd - NTP daemon program - Ver. 4.3.91\n" "Usage: %s [ - [] | --[{=| }] ]... \\\n" "\t\t[ ... ]\n\0" /* 3078 */ "http://bugs.ntp.org, bugs@ntp.org\0" /* 3112 */ "\n\0" -/* 3114 */ "ntpd 4.3.90"; +/* 3114 */ "ntpd 4.3.91"; /** * ipv4 option description with @@ -1529,7 +1529,7 @@ static void bogus_function(void) { translate option names. */ /* referenced via ntpdOptions.pzCopyright */ - puts(_("ntpd 4.3.90\n\ + puts(_("ntpd 4.3.91\n\ Copyright (C) 1992-2016 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.90\n\ + puts(_("ntpd - NTP daemon program - Ver. 4.3.91\n\ Usage: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n")); @@ -1678,7 +1678,7 @@ Usage: %s [ - [] | --[{=| }] ]... \\\n\ puts(_("\n")); /* referenced via ntpdOptions.pzFullVersion */ - puts(_("ntpd 4.3.90")); + puts(_("ntpd 4.3.91")); /* referenced via ntpdOptions.pzFullUsage */ puts(_("<<>>")); diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 8f7f79491..bb8c27fbf 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 January 20, 2016 at 11:56:49 AM by AutoGen 5.18.5 + * It has been AutoGen-ed January 24, 2016 at 12:01:50 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.90" +#define NTPD_VERSION "4.3.91" /** Full ntpd version text */ -#define NTPD_FULL_VERSION "ntpd 4.3.90" +#define NTPD_FULL_VERSION "ntpd 4.3.91" /** * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 86a60fbf7..c360c9afa 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 "20 Jan 2016" "4.3.90" "User Commands" +.TH ntpd 1ntpdman "24 Jan 2016" "4.3.91" "User Commands" .\" -.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-nWaW_R/ag-zWaO.R) +.\" EDIT THIS FILE WITH CAUTION (/tmp/.ag-FEaOUi/ag-SEaGTi) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:58:58 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:04 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 a598b4a23..702d6b4fb 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 20 2016 +.Dd January 24 2016 .Dt NTPD 1ntpdmdoc User Commands .Os .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 20, 2016 at 11:59:16 AM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 24, 2016 at 12:04:21 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 1c80a8578..352570e16 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.90 of ntpd. +

This document applies to version 4.3.91 of ntpd.