[debian-lan-devel] [debian-lan] 02/07: Pam-script fixes/updates.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 12a7170c43f195d29434a310ca47b9844937141d
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 11 10:07:26 2014 +0200

    Pam-script fixes/updates.
---
 .../{pam_script_auth => pam_script_ses_open}/DISKLESS_CLIENT         | 5 +++--
 .../libpam-script/{pam_script_auth => pam_script_ses_open}/ROAMING   | 2 +-
 fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5                      | 2 +-
 fai/config/scripts/ROAMING/10-home_nfs4_krb5                         | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fai/config/files/usr/share/libpam-script/pam_script_auth/DISKLESS_CLIENT b/fai/config/files/usr/share/libpam-script/pam_script_ses_open/DISKLESS_CLIENT
similarity index 69%
rename from fai/config/files/usr/share/libpam-script/pam_script_auth/DISKLESS_CLIENT
rename to fai/config/files/usr/share/libpam-script/pam_script_ses_open/DISKLESS_CLIENT
index e51e38b..9740f93 100755
--- a/fai/config/files/usr/share/libpam-script/pam_script_auth/DISKLESS_CLIENT
+++ b/fai/config/files/usr/share/libpam-script/pam_script_ses_open/DISKLESS_CLIENT
@@ -8,8 +8,9 @@ set -e
 FILE="/tmp/krb5cc_diskless"
 
 if [ "$PAM_USER" != "root" ] && [ ! -e /etc/krb5.keytab ] && [ ! -e $FILE ] ; then
-    cp -v /tmp/krb5cc_pam_* $FILE
-    /etc/init.d/autofs restart > /dev/null
+    ID=$(id -u "$PAM_USER")
+    cp -v /tmp/krb5cc_${ID}_* $FILE
+    systemctl restart autofs
 fi
 
 exit 0
diff --git a/fai/config/files/usr/share/libpam-script/pam_script_auth/ROAMING b/fai/config/files/usr/share/libpam-script/pam_script_ses_open/ROAMING
similarity index 95%
rename from fai/config/files/usr/share/libpam-script/pam_script_auth/ROAMING
rename to fai/config/files/usr/share/libpam-script/pam_script_ses_open/ROAMING
index a848812..7e3099b 100755
--- a/fai/config/files/usr/share/libpam-script/pam_script_auth/ROAMING
+++ b/fai/config/files/usr/share/libpam-script/pam_script_ses_open/ROAMING
@@ -27,7 +27,7 @@ fi
 if [ ! -e /etc/krb5.keytab ] && [ ! -e "$FILE" ] ; then
     ID=$(id -u "$PAM_USER")
     cp -v /tmp/krb5cc_${ID}_* $FILE
-    /etc/init.d/autofs restart > /dev/null
+    systemctl restart autofs
 fi
 
 exit 0
diff --git a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5 b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
index 22a1ecd..0bf17dc 100755
--- a/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
+++ b/fai/config/scripts/DISKLESS_CLIENT/30-nfs4_krb5
@@ -5,5 +5,5 @@ set -e
 if ! ifclass SSHFS_CLIENT ; then
     ainsl /etc/default/nfs-common 'RPCGSSDOPTS="-n"'
     ainsl /etc/pam.d/common-auth  'auth    optional  pam_script.so'
-    fcopy -m root,root,0755 /usr/share/libpam-script/pam_script_auth
+    fcopy -m root,root,0755 /usr/share/libpam-script/pam_script_ses_open
 fi
diff --git a/fai/config/scripts/ROAMING/10-home_nfs4_krb5 b/fai/config/scripts/ROAMING/10-home_nfs4_krb5
index ecf26fd..1402c59 100755
--- a/fai/config/scripts/ROAMING/10-home_nfs4_krb5
+++ b/fai/config/scripts/ROAMING/10-home_nfs4_krb5
@@ -3,5 +3,4 @@
 set -e
 
 ainsl /etc/default/nfs-common 'RPCGSSDOPTS="-n"'
-ainsl /etc/pam.d/common-auth  'auth    optional  pam_script.so'
-fcopy -m root,root,0755 /usr/share/libpam-script/pam_script_auth
+fcopy -m root,root,0755 /usr/share/libpam-script/pam_script_ses_open

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git