[25776] in Source-Commits
/svn/athena r25224 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jul 11 16:57:26 2011
Date: Mon, 11 Jul 2011 16:57:20 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107112057.p6BKvKqF023367@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-11 16:57:20 -0400 (Mon, 11 Jul 2011)
New Revision: 25224
Modified:
trunk/debathena/config/reactivate/debian/snapshot-run
Log:
Move the echo into the "set -e" block, so if a user has left an immutable
file with a tainted environment in there, it'll either get overwritten, or the login will fail.
Modified: trunk/debathena/config/reactivate/debian/snapshot-run
===================================================================
--- trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-11 20:29:37 UTC (rev 25223)
+++ trunk/debathena/config/reactivate/debian/snapshot-run 2011-07-11 20:57:20 UTC (rev 25224)
@@ -48,12 +48,13 @@
# /after/ being chrooted, which puts users back in the groups we
# added them to
+echo "KRB5CCNAME=$KRB5CCNAME" >| /tmp/ticketenv
+
set +e
cd
# Workaround for stupidity, see #928 for details
# Remove this once we're running pam-afs-session 2.4
-echo "KRB5CCNAME=$KRB5CCNAME" >| /tmp/ticketenv
schroot -c "$session" -r -p -- sudo -E -u "$USER" -- "$@"
cd /
