- uniformized configs to use system-auth where possible

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

Changed files:
    kdebase-kdesktop.pam -> 1.3
    kdebase-kdm-np.pam -> 1.3
    kdebase-kdm.pam -> 1.8

diff --git a/kdebase-kdesktop.pam b/kdebase-kdesktop.pam
index 705840bd6c586fa1d4ed6c1cbbc9bb9b155dfbac..40bfa6fccbd0dca5dd3a7c63df65bd132a6f6f58 100644 (file)
--- a/kdebase-kdesktop.pam
+++ b/kdebase-kdesktop.pam
@@ -1,2 +1,3 @@
 #%PAM-1.0
-auth           required        pam_unix.so shadow nullok
+auth           include         system-auth
+account                include         system-auth

diff --git a/kdebase-kdm-np.pam b/kdebase-kdm-np.pam
index 600068d84e45b7f36779a0722549b0ed3af55843..31c44e83101f3fa74de55069edcdb712b12b7357 100644 (file)
--- a/kdebase-kdm-np.pam
+++ b/kdebase-kdm-np.pam
@@ -2,17 +2,12 @@
 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.kdm onerr=succeed
 auth           required        pam_tally.so deny=0 file=/var/log/faillog onerr=succeed
-auth           required        pam_shells.so
-auth           required        pam_nologin.so
 auth           required        pam_permit.so
-account                required        pam_tally.so file=/var/log/faillog onerr=succeed
+account                required        pam_shells.so
+account                required        pam_nologin.so
 account                required        pam_access.so
-account                required        pam_time.so
-account                required        pam_unix.so
-password       required        pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password       required        pam_unix.so md5 shadow use_authtok
-password       required        pam_exec.so failok seteuid /usr/bin/make -C /var/db
-session                required        pam_unix.so
-session                required        pam_env.so
-session                required        pam_limits.so change_uid
+account                include         system-auth
+password       include         system-auth
+session                optional        pam_keyinit.so force revoke
+session                include         system-auth
 session                optional        pam_console.so

diff --git a/kdebase-kdm.pam b/kdebase-kdm.pam
index 19d37834861dfadd3612e7c53e2a1460fae6ea89..0b96be1177df2c7d9edb583a02940b88ca9158fc 100644 (file)
--- a/kdebase-kdm.pam
+++ b/kdebase-kdm.pam
@@ -1,19 +1,11 @@
 #%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.kdm onerr=succeed
-auth           required        pam_unix.so
-auth           required        pam_tally.so deny=0 file=/var/log/faillog onerr=succeed
-auth           required        pam_shells.so
-auth           required        pam_nologin.so
-auth           optional        pam_mail.so
-account                required        pam_tally.so file=/var/log/faillog onerr=succeed
+auth           include         system-auth
+account                required        pam_shells.so
+account                required        pam_nologin.so
 account                required        pam_access.so
-account                required        pam_time.so
-account                required        pam_unix.so
-password       required        pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-password       required        pam_unix.so md5 shadow use_authtok
-password       required        pam_exec.so failok seteuid /usr/bin/make -C /var/db
-session                required        pam_unix.so
-session                required        pam_env.so
-session                required        pam_limits.so change_uid
+account                include         system-auth
+password       include         system-auth
+session                optional        pam_keyinit.so force revoke
+session                include         system-auth
 session                optional        pam_console.so