- uniformized configs to use system-auth where possible

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

Changed files:
    courier-imap-pop3.pamd -> 1.4
    courier-imap.pamd -> 1.5

diff --git a/courier-imap-pop3.pamd b/courier-imap-pop3.pamd
index 949308d30c570649f63ae2e589bef1210a33f989..2c45feda675ba1e18dad1589163280c9f341c22b 100644 (file)
--- a/courier-imap-pop3.pamd
+++ b/courier-imap-pop3.pamd
@@ -1,9 +1,6 @@
 #%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.pop3 onerr=succeed
-auth           required        pam_unix.so
-auth           required        pam_tally.so deny=0 file=/var/log/faillog onerr=succeed
-auth           required        pam_nologin.so
-account                required        pam_tally.so file=/var/log/faillog onerr=succeed
-account                required        pam_unix.so
-session                required        pam_unix.so
+auth           include         system-auth
+account                required        pam_nologin.so
+account                include         system-auth
+session                include         system-auth

diff --git a/courier-imap.pamd b/courier-imap.pamd
index ef04f3375462e16010b000800eb1d45d86827d16..5b48c5206907c6d35484c997d6146be4150bed88 100644 (file)
--- a/courier-imap.pamd
+++ b/courier-imap.pamd
@@ -1,9 +1,6 @@
 #%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/log/faillog onerr=succeed
-auth           required        pam_nologin.so
-account                required        pam_tally.so file=/var/log/faillog onerr=succeed
-account                required        pam_unix.so
-session                required        pam_unix.so
+auth           include         system-auth
+account                required        pam_nologin.so
+account                include         system-auth
+session                include         system-auth