diff options
author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/ntpd/invoke-ntp.conf.texi | |
parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/ntpd/invoke-ntp.conf.texi')
-rw-r--r-- | contrib/ntp/ntpd/invoke-ntp.conf.texi | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/contrib/ntp/ntpd/invoke-ntp.conf.texi b/contrib/ntp/ntpd/invoke-ntp.conf.texi index d7a9d13..37427d6 100644 --- a/contrib/ntp/ntpd/invoke-ntp.conf.texi +++ b/contrib/ntp/ntpd/invoke-ntp.conf.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp.conf.texi) # -# It has been AutoGen-ed June 29, 2015 at 04:30:28 PM by AutoGen 5.18.5 +# It has been AutoGen-ed October 21, 2015 at 12:38:16 PM by AutoGen 5.18.5 # From the definitions ntp.conf.def # and the template file agtexi-file.tpl @end ignore @@ -1837,7 +1837,7 @@ re-associate accordingly. Some administrators prefer to avoid running @code{ntpd(1ntpdmdoc)} continuously and run either -@code{ntpdate(8)} +@code{sntp(1sntpmdoc)} or @code{ntpd(1ntpdmdoc)} @code{-q} @@ -1921,7 +1921,7 @@ peers remaining. This value defaults to 1, but can be changed to any number from 1 to 15. @item @code{minclock} @kbd{minclock} -The clustering algorithm repeatedly casts out outlyer +The clustering algorithm repeatedly casts out outlier associations until no more than @code{minclock} associations remain. @@ -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()} |