manage non-interactive pam-session as well

[mirror/dsa-puppet.git] / modules / debian-org / templates / pam.common-session.erb

diff --git a/modules/debian-org/templates/pam.common-session.erb b/modules/debian-org/templates/pam.common-session.erb
index be99343..b79cffa 100644 (file)
--- a/modules/debian-org/templates/pam.common-session.erb
+++ b/modules/debian-org/templates/pam.common-session.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
+<% unless lsbdistcodename == 'lenny' %>
 #
 # /etc/pam.d/common-session - session-related modules common to all services
 #
@@ -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