From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 13 Jan 2013 07:37:17 +0000 (+0000)
Subject: In ntp.conf.def, cleanup SEE ALSO, document 'rlimit' options
X-Git-Tag: NTP_4_2_7P348~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81d75879500c85aa427425747071ebb12bd3bbb2;p=thirdparty%2Fntp.git

In ntp.conf.def, cleanup SEE ALSO, document 'rlimit' options

bk: 50f2642dSprqZGBtY9mjtCZp7Gn1xQ
---

diff --git a/ChangeLog b/ChangeLog
index 54f095a4e..e5f4a3f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 2327] Rename sntp/ag-tpl/:Old to sntp/ag-tpl/Old.
+* In ntp.conf.def, cleanup SEE ALSO, document 'rlimit' options.
 * Add a reference to RFC5907 in the ntpsnmpd documentation.
 (4.2.7p347) 2013/01/07 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2325] Re-enable mlockall() check under Linux post-1223 fix.
diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index a3fe4d3c8..7a37f352d 100644
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -2659,6 +2659,26 @@ be set to any positive number in seconds.
 If set to zero, the stepout
 pulses will not be suppressed.
 .El
+.It Xo Ic rlimit
+.Oo
+.Cm memlock Ar Nmegabytes |
+.Cm stacklimit Ar N4kPages
+.Oc
+.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
+when dropping root (the
+.Fl i
+option).
+The default is 32 megabytes.
+.It Cm stacklimit Ar N4kPages
+Specifies the maximum size of the process stack on systems with the
+.Fn mlockall
+function.
+Defaults to 50 4k pages (200 4k pages in OpenBSD).
+.El
 .It Xo Ic trap Ar host_address
 .Op Cm port Ar port_number
 .Op Cm interface Ar interface_address
@@ -2714,7 +2734,6 @@ doc-section	= {
   ds-type	= 'SEE ALSO';
   ds-format	= 'mdoc';
   ds-text	= <<- _END_MDOC_SEE_ALSO
-.Sh SEE ALSO
 .Xr ntpd 1ntpdmdoc ,
 .Xr ntpdc 1ntpdcmdoc ,
 .Xr ntpq 1ntpqmdoc