Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Be less noisy tho
  Do not run pam_mkhomedir if your homedir is /nonexistent

diff --git a/modules/debian-org/templates/pam.common-session.erb b/modules/debian-org/templates/pam.common-session.erb
index 07c4fdf0fa1fe2d36f2beccb25888f3ce4e91616..b79cffaa1f73ba3994ef4e2995af1be70966b554 100644 (file)
--- a/modules/debian-org/templates/pam.common-session.erb
+++ b/modules/debian-org/templates/pam.common-session.erb
@@ -29,7 +29,9 @@ session       required                        pam_permit.so
 # and here are more per-package modules (the "Additional" block)
 session        required        pam_unix.so 
 # end of pam-auth-update config
-session        optional        pam_mkhomedir.so skel=/etc/skel umask=0022
+session        [success=1 default=ignore]      pam_succeed_if.so quiet_fail quiet_success home = /nonexistent
+session        optional                        pam_mkhomedir.so skel=/etc/skel umask=0022
+session        optional                        pam_permit.so
 <% else %>
 #
 # /etc/pam.d/common-session - session-related modules common to all services