pam: Make common-account also support unix users.

[matthijs/servers/drsnuggles.git] / etc / pam.d / common-account

diff --git a/etc/pam.d/common-account b/etc/pam.d/common-account
index c2e28cb63cfba5a05ecd5a4ac3d131dea167b1b9..9d8619edfdc269bf39a77030f4cf178daba510d8 100644 (file)
--- a/etc/pam.d/common-account
+++ b/etc/pam.d/common-account
@@ -9,9 +9,11 @@
 # Default was:
 #account       required        pam_unix.so
 #
-# LDAP config copied from http://wiki.debian.org/LDAP/PAM
-account     required      pam_unix.so
-account     sufficient    pam_succeed_if.so uid < 1000 quiet
-account     [default=bad success=ok user_unknown=ignore] pam_ldap.so
-account     required      pam_permit.so
+# pam_unix does general checks based on NSS info, so it also works for ldap
+# users.
+account                required        pam_unix.so
 
+# pam_ldap does additional checks (in particular checking the host ldap
+# attribute) but needs to be ignored when it does not know about a user.
+account         [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=ignore default=bad] \
+                                pam_ldap.so