From: Iain Patterson <me@iain.cx>
Date: Fri, 9 May 2014 11:01:15 +0000 (+0100)
Subject: Look in HOME then PROFILE_HOME for .become files.
X-Git-Url: http://git.iain.cx/?p=profile.git;a=commitdiff_plain;h=306d0e3ec61ab86c374ca0686f78b56e02788187

Look in HOME then PROFILE_HOME for .become files.

Propagate per-user profile files scripts by looking in $HOME/.become
then $PROFILE_HOME/.become for the <user> and "all" files.

If you explicitly don't want to include files from PROFILE_HOME, eg
because you are using another user's profile but he has incompatible
scripts, make $HOME/.become/all sticky.
---

diff --git a/opt/bin/become b/opt/bin/become
index a7ad44a..ee447c7 100755
--- a/opt/bin/become
+++ b/opt/bin/become
@@ -37,9 +37,27 @@ PRINCIPAL=$(klist 2>/dev/null | sed -n 's/^Default principal: //p')
 if [ $x11 = 1 -a -n "$DISPLAY" -a "${DISPLAY##localhost:}" = "$DISPLAY" ]; then
   COOKIE="$(xauth list $DISPLAY)"
 fi
-BECOME="$HOME/.become"
-profile="$BECOME/$user"
-[ -f "$profile" ] || profile="$BECOME/all"
+ignore_profile_user=0
+for candidate in "$HOME" "$PROFILE_HOME"; do
+  [ -n "$candidate" ] || continue
+  BECOME="$candidate/.become"
+  [ -d "$BECOME" ] || continue
+
+  # Script to run when becoming any user.
+  [ -z "$allusersprofile" ] && allusersprofile="$BECOME/all"
+  [ -f "$allusersprofile" ] || allusersprofile=
+
+  # Set $HOME/all sticky to ignore $PROFILE_HOME/$user.
+  if [ "$candidate" = "$HOME" ]; then
+    [ -k "$BECOME/all" ] && ignore_profile_user=1
+  else
+    [ $ignore_profile_user = 1 ] && continue
+  fi
+
+  # Script to run (after the one mentioned above) when becoming this user.
+  [ -z "$userprofile" ] && userprofile="$BECOME/$user"
+  [ -f "$userprofile" ] || userprofile=
+done
 
 file="${TMPDIR:-/tmp}/$USER.become.$user.$RANDOM.$$"
 umask=$(builtin umask -p)
@@ -72,8 +90,8 @@ else
 fi
 
 echo >&3 ". ${PROFILE_HOME:-$HOME}/.bash_profile"
-[ -f "$BECOME/all" ] && cat >&3 2>/dev/null "$BECOME/all"
-[ -f "$BECOME/$user" ] && cat >&3 2>/dev/null "$BECOME/$user"
+[ -f "$allusersprofile" ] && cat >&3 2>/dev/null "$allusersprofile"
+[ -f "$userprofile" ] && cat >&3 2>/dev/null "$userprofile"
 [ $chdir = 1 ] && echo >&3 2>/dev/null "cd - &>/dev/null"
 
 exec 3>&-