- uniformized configs to use system-auth where possible

- sanitized
- uniform blacklist for pop3, imap and smtp services

Changed files:
    cyrus-imapd-pop.pamd -> 1.6
    cyrus-imapd.pamd -> 1.6

diff --git a/cyrus-imapd-pop.pamd b/cyrus-imapd-pop.pamd
index 08e680978497faed68f65a2038402e17069809f4..7fe8c2683e2eafd53e75c74a6a77a866618e0be1 100644 (file)
--- a/cyrus-imapd-pop.pamd
+++ b/cyrus-imapd-pop.pamd
@@ -1,9 +1,5 @@
 #%PAM-1.0
-auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
-auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.pop onerr=succeed
-auth           required        pam_unix.so
-auth           required        pam_tally.so deny=0 file=/var/lib/imap/faillog onerr=succeed
-auth           required        pam_nologin.so
-account                required        pam_tally.so file=/var/lib/imap/faillog onerr=succeed
-#account               required        pam_access.so
-account                required        pam_unix.so
+auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.pop3 onerr=succeed
+auth           include         system-auth
+account                required        pam_nologin.so
+account                include         system-auth

diff --git a/cyrus-imapd.pamd b/cyrus-imapd.pamd
index a705a527a1afbf1766d551666a9175e14033e2a8..0d25765ff1fd0bbb10dfd8e2ebb2181b4b57aa6c 100644 (file)
--- a/cyrus-imapd.pamd
+++ b/cyrus-imapd.pamd
@@ -1,9 +1,5 @@
 #%PAM-1.0
-auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
 auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.imap onerr=succeed
-auth           required        pam_unix.so
-auth           required        pam_tally.so deny=0 file=/var/lib/imap/faillog onerr=succeed
-auth           required        pam_nologin.so
-account                required        pam_tally.so file=/var/lib/imap/faillog onerr=succeed
-#account               required        pam_access.so
-account                required        pam_unix.so
+auth           include         system-auth
+account                required        pam_nologin.so
+account                include         system-auth