Relevant BUGIDs: 1706247

Purpose of commit: bugfix

Commit summary:
---------------

2007-04-30  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_mail/pam_mail.c (_do_mail): Remove duplicate
        check for PAM_SILENT and don't bail out if it is set [#1706247].

4 files changed, 59 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index e82bc7e5..5d68c133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-30  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+	* modules/pam_mail/pam_mail.c (_do_mail): Remove duplicate
+	check for PAM_SILENT and don't bail out if it is set [#1706247].
+
 2007-03-29  Tomas Mraz  <t8m@centrum.cz>
 
 	* modules/pam_access/pam_access.c (login_access, list_match):
@@ -32,7 +37,7 @@
 
 	* modules/pam_unix/unix_chkpwd.c (_unix_verify_password): Test for
 	allocation failure in bigcrypt().
-	
+
 	* modules/pam_unix/pam_unix_passwd.c (pam_sm_chauthtok): Allow
 	modification of '*' password by root.
 
@@ -44,7 +49,7 @@
 2007-02-01  Tomas Mraz  <t8m@centrum.cz>
 
 	* xtests/tst-pam_unix3.c: Fix typos in comments.
-	
+
 	* modules/pam_unix/support.c (_unix_verify_password): Explicitly
 	disallow '!' in the beginning of password hash. Treat only
 	13 bytes password hash specifically. (Suggested by Solar Designer.)
diff --git a/modules/pam_limits/README b/modules/pam_limits/README
index adab19df..26336711 100644
--- a/modules/pam_limits/README
+++ b/modules/pam_limits/README
@@ -8,6 +8,13 @@ The pam_limits PAM module sets limits on the system resources that can be
 obtained in a user-session. Users of uid=0 are affected by this limits, too.
 
 By default limits are taken from the /etc/security/limits.conf config file.
+Then individual files from the /etc/security/limits.d/ directory are read. The
+files are parsed one after another in the order of "C" locale. The effect of
+the individual files is the same as if all the files were concatenated together
+in the order of parsing. If a config file is explicitely specified with a
+module option then the files in the above directory are not parsed.
+
+The module must not be called by a multithreaded application.
 
 OPTIONS
 
diff --git a/modules/pam_limits/pam_limits.8 b/modules/pam_limits/pam_limits.8
index 9083e14d..4f01e4cf 100644
--- a/modules/pam_limits/pam_limits.8
+++ b/modules/pam_limits/pam_limits.8
@@ -1,11 +1,11 @@
 .\"     Title: pam_limits
 .\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
-.\"      Date: 06/17/2006
+.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
+.\"      Date: 04/30/2007
 .\"    Manual: Linux\-PAM Manual
 .\"    Source: Linux\-PAM Manual
 .\"
-.TH "PAM_LIMITS" "8" "06/17/2006" "Linux\-PAM Manual" "Linux\-PAM Manual"
+.TH "PAM_LIMITS" "8" "04/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -23,58 +23,86 @@ are affected by this limits, too.
 .PP
 By default limits are taken from the
 \fI/etc/security/limits.conf\fR
-config file.
+config file. Then individual files from the
+\fI/etc/security/limits.d/\fR
+directory are read. The files are parsed one after another in the order of "C" locale. The effect of the individual files is the same as if all the files were concatenated together in the order of parsing. If a config file is explicitely specified with a module option then the files in the above directory are not parsed.
+.PP
+The module must not be called by a multithreaded application.
 .SH "OPTIONS"
-.TP 3n
+.PP
 \fBchange_uid\fR
+.RS 4
 Change real uid to the user for who the limits are set up. Use this option if you have problems like login not forking a shell for user who has no processes. Be warned that something else may break when you do this.
-.TP 3n
+.RE
+.PP
 \fBconf=\fR\fB\fI/path/to/limits.conf\fR\fR
+.RS 4
 Indicate an alternative limits.conf style configuration file to override the default.
-.TP 3n
+.RE
+.PP
 \fBdebug\fR
+.RS 4
 Print debug information.
-.TP 3n
+.RE
+.PP
 \fButmp_early\fR
+.RS 4
 Some broken applications actually allocate a utmp entry for the user before the user is admitted to the system. If some of the services you are configuring PAM for do this, you can selectively use this module argument to compensate for this behavior and at the same time maintain system\-wide consistency with a single limits.conf file.
+.RE
 .SH "MODULE SERVICES PROVIDED"
 .PP
 Only the
 \fBsession\fR
 service is supported.
 .SH "RETURN VALUES"
-.TP 3n
+.PP
 PAM_ABORT
+.RS 4
 Cannot get current limits.
-.TP 3n
+.RE
+.PP
 PAM_IGNORE
+.RS 4
 No limits found for this user.
-.TP 3n
+.RE
+.PP
 PAM_PERM_DENIED
+.RS 4
 New limits could not be set.
-.TP 3n
+.RE
+.PP
 PAM_SERVICE_ERR
+.RS 4
 Cannot read config file.
-.TP 3n
+.RE
+.PP
 PAM_SESSEION_ERR
+.RS 4
 Error recovering account name.
-.TP 3n
+.RE
+.PP
 PAM_SUCCESS
+.RS 4
 Limits were changed.
-.TP 3n
+.RE
+.PP
 PAM_USER_UNKNOWN
+.RS 4
 The user is not known to the system.
+.RE
 .SH "FILES"
-.TP 3n
+.PP
 \fI/etc/security/limits.conf\fR
+.RS 4
 Default configuration file
+.RE
 .SH "EXAMPLES"
 .PP
 For the services you need resources limits (login for example) put a the following line in
 \fI/etc/pam.d/login\fR
 as the last line for that service (usually after the pam_unix session line):
 .sp
-.RS 3n
+.RS 4
 .nf
 #%PAM\-1.0
 #
diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c
index 7d43d5e0..46395b53 100644
--- a/modules/pam_mail/pam_mail.c
+++ b/modules/pam_mail/pam_mail.c
@@ -411,11 +411,6 @@ static int _do_mail(pam_handle_t *pamh, int flags, int argc,
 
     ctrl = _pam_parse(pamh, flags, argc, argv, &path_mail, &hashcount);
 
-    /* Do we have anything to do? */
-
-    if (flags & PAM_SILENT)
-	return PAM_SUCCESS;
-
     /* which folder? */
 
     retval = get_folder(pamh, ctrl, path_mail, &folder, hashcount);