summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2008-12-02 22:11:07 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2008-12-02 22:11:07 +0000
commitde63f0160c57494553e400aca215ffe316e946b7 (patch)
treeb0b996d8ded5a47963a42f06b0ba9d5a37cec673
parentd9719b48ab49957f5b983bfcfadf25d23e6674ed (diff)
Relevant BUGIDs: bnc#448314
Purpose of commit: enhancement Commit summary: --------------- 2008-12-02 Michael Calmer <mc@suse.de> * modules/pam_limits/limits.conf.5.xml: Document valid values for limits (bnc#448314).
-rw-r--r--ChangeLog5
-rw-r--r--modules/pam_limits/limits.conf.5.xml8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 06b98c31..b769bd30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-02 Michael Calmer <mc@suse.de>
+
+ * modules/pam_limits/limits.conf.5.xml: Document valid values
+ for limits (bnc#448314).
+
2008-12-02 Thorsten Kukuk <kukuk@thkukuk.de>
* modules/pam_env/pam_env.c: Add support for user specific
diff --git a/modules/pam_limits/limits.conf.5.xml b/modules/pam_limits/limits.conf.5.xml
index f831a909..aabcf2cc 100644
--- a/modules/pam_limits/limits.conf.5.xml
+++ b/modules/pam_limits/limits.conf.5.xml
@@ -230,6 +230,11 @@
</variablelist>
<para>
+ All items support the values <emphasis>-1</emphasis>,
+ <emphasis>unlimited</emphasis> or <emphasis>infinity</emphasis> indicating no limit,
+ except for <emphasis remap='B'>priority</emphasis> and <emphasis remap='B'>nice</emphasis>.
+ </para>
+ <para>
In general, individual limits have priority over group limits, so if
you impose no limits for <emphasis>admin</emphasis> group, but one of
the members in this group have a limits line, the user will have its
@@ -274,7 +279,8 @@ ftp hard nproc 0
<para>
<citerefentry><refentrytitle>pam_limits</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>getrlimit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
</para>
</refsect1>