[PC-BSD Commits] r19240 - in pcbsd/current/overlays/desktop-overlay/usr/local: bin etc/pam.d

[svn at pcbsd.org]

Author: kris
Date: 2012-09-17 15:11:05 +0000 (Mon, 17 Sep 2012)
New Revision: 19240

Modified:
   pcbsd/current/overlays/desktop-overlay/usr/local/bin/enable_user_pefs
   pcbsd/current/overlays/desktop-overlay/usr/local/etc/pam.d/gdm
Log:

Add fixed pam.d GDM config, and setup the enable_user_pefs script. Now it works
with the upcoming version of PEFS into ports. 



Modified: pcbsd/current/overlays/desktop-overlay/usr/local/bin/enable_user_pefs
===================================================================
--- pcbsd/current/overlays/desktop-overlay/usr/local/bin/enable_user_pefs	2012-09-17 15:04:05 UTC (rev 19239)
+++ pcbsd/current/overlays/desktop-overlay/usr/local/bin/enable_user_pefs	2012-09-17 15:11:05 UTC (rev 19240)
@@ -32,11 +32,8 @@
 chown ${USER}:${USER} ${USERHOMEDIR}
 
 pefs mount ${USERHOMEDIR} ${USERHOMEDIR}
-# KPM - Fix to use script supplied password once pefs supports it
-#echo "$USERPW" | pefs addkey -p -k - ${USERHOMEDIR}
-#echo "$USERPW" | pefs addchain -p -k - -Z ${USERHOMEDIR}
-pefs addkey ${USERHOMEDIR}
-pefs addchain -Z ${USERHOMEDIR}
+echo "${USERPW}" | pefs addkey -v -j - ${USERHOMEDIR}
+echo "${USERPW}" | pefs addchain -v -j - -Z ${USERHOMEDIR}
 
 mv ${USERHOMEDIR}/.pefs.db /tmp/.pefs.db.$$
 tar cvf - -C "${USERHOMEDIR}.$$" . 2>/dev/null | tar xvpf - -C "${USERHOMEDIR}" 2>/dev/null

Modified: pcbsd/current/overlays/desktop-overlay/usr/local/etc/pam.d/gdm
===================================================================
--- pcbsd/current/overlays/desktop-overlay/usr/local/etc/pam.d/gdm	2012-09-17 15:04:05 UTC (rev 19239)
+++ pcbsd/current/overlays/desktop-overlay/usr/local/etc/pam.d/gdm	2012-09-17 15:11:05 UTC (rev 19240)
@@ -8,7 +8,7 @@
 # auth
 #auth		sufficient	pam_krb5.so		no_warn try_first_pass
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
-auth		sufficient	/usr/local/lib/pam_pefs.so	try_first_pass delkeys
+auth		sufficient	/usr/local/lib/pam_pefs.so try_first_pass delkeys
 auth		required	pam_unix.so		no_warn try_first_pass
 auth		optional	/usr/local/lib/pam_gnome_keyring.so