diff options
author | delphij <delphij@FreeBSD.org> | 2016-01-22 15:55:21 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2016-01-22 15:55:21 +0000 |
commit | 0e1dba9a0aa72f6f27001a50552a8c67575da336 (patch) | |
tree | dbb1c1e8cb8058b52ef547a1f18b9751613aeb04 /contrib/ntp/ntpd/ntp.keys.man.in | |
parent | 7a67cba86b1ced9982ebb0dd11a9a987829efe9e (diff) | |
download | FreeBSD-src-0e1dba9a0aa72f6f27001a50552a8c67575da336.zip FreeBSD-src-0e1dba9a0aa72f6f27001a50552a8c67575da336.tar.gz |
MFC r294554: MFV r294491: ntp 4.2.8p6.
Security: CVE-2015-7973, CVE-2015-7974, CVE-2015-7975
Security: CVE-2015-7976, CVE-2015-7977, CVE-2015-7978
Security: CVE-2015-7979, CVE-2015-8138, CVE-2015-8139
Security: CVE-2015-8140, CVE-2015-8158
With hat: so
Diffstat (limited to 'contrib/ntp/ntpd/ntp.keys.man.in')
-rw-r--r-- | contrib/ntp/ntpd/ntp.keys.man.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/contrib/ntp/ntpd/ntp.keys.man.in b/contrib/ntp/ntpd/ntp.keys.man.in index 78d5f09..2e97e27 100644 --- a/contrib/ntp/ntpd/ntp.keys.man.in +++ b/contrib/ntp/ntpd/ntp.keys.man.in @@ -1,8 +1,8 @@ -.TH ntp.keys 5 "07 Jan 2016" "4.2.8p5" "File Formats" +.TH ntp.keys 5 "20 Jan 2016" "4.2.8p6" "File Formats" .\" .\" EDIT THIS FILE WITH CAUTION (ntp.man) .\" -.\" It has been AutoGen-ed January 7, 2016 at 11:30:41 PM by AutoGen 5.18.5 +.\" It has been AutoGen-ed January 20, 2016 at 04:17:51 AM by AutoGen 5.18.5 .\" From the definitions ntp.keys.def .\" and the template file agman-file.tpl .Sh NAME @@ -66,7 +66,7 @@ Key entries use a fixed format of the form .ne 2 .in +4 -\f\*[I-Font]keyno\f[] \f\*[I-Font]type\f[] \f\*[I-Font]key\f[] +\f\*[I-Font]keyno\f[] \f\*[I-Font]type\f[] \f\*[I-Font]key\f[] \f\*[I-Font]opt_IP_list\f[] .in -4 .sp \n(Ppu .ne 2 @@ -78,7 +78,15 @@ is a positive integer (between 1 and 65534), is the message digest algorithm, and \f\*[I-Font]key\f[] -is the key itself. +is the key itself, and +\f\*[I-Font]opt_IP_list\f[] +is an optional comma-separated list of IPs +that are allowed to serve time. +If +\f\*[I-Font]opt_IP_list\f[] +is empty, +any properly-authenticated server message will be +accepted. .sp \n(Ppu .ne 2 @@ -160,7 +168,7 @@ the default name of the configuration file .SH "AUTHORS" The University of Delaware and Network Time Foundation .SH "COPYRIGHT" -Copyright (C) 1992-2015 The University of Delaware and Network Time Foundation all rights reserved. +Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation all rights reserved. This program is released under the terms of the NTP license, <http://ntp.org/license>. .SH "BUGS" Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org |