|
 |
b10636 |
diff -up Linux-PAM-1.1.8/modules/pam_limits/limits.conf.docfix Linux-PAM-1.1.8/modules/pam_limits/limits.conf
|
|
|
b10636 |
--- Linux-PAM-1.1.8/modules/pam_limits/limits.conf.docfix 2014-07-14 14:58:05.000000000 +0200
|
|
|
b10636 |
+++ Linux-PAM-1.1.8/modules/pam_limits/limits.conf 2014-09-10 16:42:51.254747161 +0200
|
|
|
b10636 |
@@ -32,7 +32,7 @@
|
|
|
b10636 |
# - data - max data size (KB)
|
|
|
b10636 |
# - fsize - maximum filesize (KB)
|
|
|
b10636 |
# - memlock - max locked-in-memory address space (KB)
|
|
|
b10636 |
-# - nofile - max number of open files
|
|
|
b10636 |
+# - nofile - max number of open file descriptors
|
|
|
b10636 |
# - rss - max resident set size (KB)
|
|
|
b10636 |
# - stack - max stack size (KB)
|
|
|
b10636 |
# - cpu - max CPU time (MIN)
|
|
|
b10636 |
diff -up Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml.docfix Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml
|
|
|
b10636 |
--- Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml.docfix 2013-06-18 16:11:21.000000000 +0200
|
|
|
b10636 |
+++ Linux-PAM-1.1.8/modules/pam_limits/limits.conf.5.xml 2014-09-10 16:44:01.624367933 +0200
|
|
|
b10636 |
@@ -178,7 +178,7 @@
|
|
|
b10636 |
<varlistentry>
|
|
|
b10636 |
<term><option>nofile</option></term>
|
|
|
b10636 |
<listitem>
|
|
|
b10636 |
- <para>maximum number of open files</para>
|
|
|
b10636 |
+ <para>maximum number of open file descriptors</para>
|
|
|
b10636 |
</listitem>
|
|
|
b10636 |
</varlistentry>
|
|
|
b10636 |
<varlistentry>
|
|
|
b10636 |
@@ -214,14 +214,17 @@
|
|
|
b10636 |
<varlistentry>
|
|
|
b10636 |
<term><option>maxlogins</option></term>
|
|
|
b10636 |
<listitem>
|
|
|
b10636 |
- <para>maximum number of logins for this user except
|
|
|
b10636 |
- for this with <emphasis>uid=0</emphasis></para>
|
|
|
b10636 |
+ <para>maximum number of logins for this user (this limit does
|
|
|
b10636 |
+ not apply to user with <emphasis>uid=0</emphasis>)</para>
|
|
|
b10636 |
</listitem>
|
|
|
b10636 |
</varlistentry>
|
|
|
b10636 |
<varlistentry>
|
|
|
b10636 |
<term><option>maxsyslogins</option></term>
|
|
|
b10636 |
<listitem>
|
|
|
b10636 |
- <para>maximum number of all logins on system</para>
|
|
|
b10636 |
+ <para>maximum number of all logins on system; user is not
|
|
|
b10636 |
+ allowed to log-in if total number of all users' logins is
|
|
|
b10636 |
+ greater than specified number (this limit does not apply to
|
|
|
b10636 |
+ user with <emphasis>uid=0</emphasis>)</para>
|
|
|
b10636 |
</listitem>
|
|
|
b10636 |
</varlistentry>
|
|
|
b10636 |
<varlistentry>
|
|
|
b10636 |
@@ -292,7 +295,7 @@
|
|
|
b10636 |
permanent; existing only for the duration of the session.
|
|
|
b10636 |
One exception is the <emphasis>maxlogin</emphasis> option, this one
|
|
|
b10636 |
is system wide. But there is a race, concurrent logins at the same
|
|
|
b10636 |
- time will not always be detect as such but only counted as one.
|
|
|
b10636 |
+ time will not always be detected as such but only counted as one.
|
|
|
b10636 |
</para>
|
|
|
b10636 |
<para>
|
|
|
b10636 |
In the <emphasis>limits</emphasis> configuration file, the
|