diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | modules/pam_limits/limits.conf.5 | 35 | ||||
| -rw-r--r-- | modules/pam_limits/limits.conf.5.xml | 3 |
3 files changed, 24 insertions, 19 deletions
@@ -1,3 +1,8 @@ +2007-08-30 Thorsten Kukuk <kukuk@thkukuk.de> + + * modules/pam_limits/limits.conf.5.xml: Document that maxlogins + is ignored for users with UID 0. + 2007-08-30 Steve Langasek <vorlon@debian.org> * modules/pam_cracklib/pam_cracklib.c: diff --git a/modules/pam_limits/limits.conf.5 b/modules/pam_limits/limits.conf.5 index 3cf62f26..9fef98d7 100644 --- a/modules/pam_limits/limits.conf.5 +++ b/modules/pam_limits/limits.conf.5 @@ -1,11 +1,11 @@ .\" Title: limits.conf .\" Author: -.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/> -.\" Date: 04/30/2007 -.\" Manual: Linux\-PAM Manual -.\" Source: Linux\-PAM Manual +.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/> +.\" Date: 08/30/2007 +.\" Manual: Linux-PAM Manual +.\" Source: Linux-PAM Manual .\" -.TH "LIMITS.CONF" "5" "04/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual" +.TH "LIMITS.CONF" "5" "08/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -27,21 +27,19 @@ The fields listed above should be filled as follows: \fB<domain>\fR .RS 4 .RS 4 -.TP 4 -\(bu -a username -.TP 4 -\(bu -a groupname, with +\h'-04'\(bu\h'+03'a username +.RE +.RS 4 +\h'-04'\(bu\h'+03'a groupname, with \fB@group\fR syntax. This should not be confused with netgroups. -.TP 4 -\(bu -the wildcard +.RE +.RS 4 +\h'-04'\(bu\h'+03'the wildcard \fB*\fR, for default entry. -.TP 4 -\(bu -the wildcard +.RE +.RS 4 +\h'-04'\(bu\h'+03'the wildcard \fB%\fR, for maxlogins limit only, can also be used with \fI%group\fR syntax. @@ -139,7 +137,8 @@ address space limit (KB) .PP \fBmaxlogins\fR .RS 4 -maximum number of logins for this user +maximum number of logins for this user except for this with +\fIuid=0\fR .RE .PP \fBmaxsyslogins\fR diff --git a/modules/pam_limits/limits.conf.5.xml b/modules/pam_limits/limits.conf.5.xml index 830aa022..48798470 100644 --- a/modules/pam_limits/limits.conf.5.xml +++ b/modules/pam_limits/limits.conf.5.xml @@ -175,7 +175,8 @@ <varlistentry> <term><option>maxlogins</option></term> <listitem> - <para>maximum number of logins for this user</para> + <para>maximum number of logins for this user except + for this with <emphasis>uid=0</emphasis></para> </listitem> </varlistentry> <varlistentry> |