File pam_mail.diff of Package pam

2008-09-25  Thorsten Kukuk  <kukuk@thkukuk.de>

	* modules/pam_mail/pam_mail.c (report_mail): Fix logic of
	"quiet" option (Patch from Andreas Henriksson <andreas@fatal.se>)

	* modules/pam_mail/pam_mail.8.xml: Fix typo.

diff -u -r1.5 pam_mail.8.xml
--- modules/pam_mail/pam_mail.8.xml	18 Aug 2008 13:29:24 -0000	1.5
+++ modules/pam_mail/pam_mail.8.xml	25 Sep 2008 11:51:29 -0000
@@ -40,7 +40,7 @@
 	nopen
       </arg>
       <arg choice="opt">
-	quit
+	quiet
       </arg>
       <arg choice="opt">
 	standard
--- modules/pam_mail/pam_mail.c	30 Apr 2007 10:56:24 -0000	1.19
+++ modules/pam_mail/pam_mail.c	25 Sep 2008 11:51:29 -0000
@@ -303,8 +303,13 @@
 {
     int retval;
 
-    if (!(ctrl & PAM_MAIL_SILENT) ||
-	((ctrl & PAM_QUIET_MAIL) && type == HAVE_NEW_MAIL))
+    if ((ctrl & PAM_MAIL_SILENT) ||
+	((ctrl & PAM_QUIET_MAIL) && type != HAVE_NEW_MAIL))
+      {
+	D(("keeping quiet"));
+	retval = PAM_SUCCESS;
+      }
+    else
       {
 	if (ctrl & PAM_STANDARD_MAIL)
 	  switch (type)
@@ -345,11 +350,6 @@
 	      break;
 	    }
       }
-    else
-      {
-	D(("keeping quiet"));
-	retval = PAM_SUCCESS;
-      }
 
     D(("returning %s", pam_strerror(pamh, retval)));
     return retval;