git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't change directory by default unless becoming root.
[profile.git]
/
opt
/
bin
/
become
diff --git
a/opt/bin/become
b/opt/bin/become
index
cfc498e
..
e874ae5
100755
(executable)
--- a/
opt/bin/become
+++ b/
opt/bin/become
@@
-1,9
+1,11
@@
#!/bin/bash
#!/bin/bash
+chdir=0
kerberos=0
x11=0
while getopts ":kx" opt; do
case $opt in
kerberos=0
x11=0
while getopts ":kx" opt; do
case $opt in
+ c) chdir=1;;
k) kerberos=1;;
x) x11=1;;
esac
k) kerberos=1;;
x) x11=1;;
esac
@@
-12,8
+14,9
@@
shift $((OPTIND-1))
user="$1"; shift
if [ -z "$user" ]; then
user="$1"; shift
if [ -z "$user" ]; then
- echo >&2 "Usage: become [-k] [-x] <user>"
- echo >&2 "Options: -k Delegate Kerberos credentials even if target user is not root."
+ echo >&2 "Usage: become [-c] [-k] [-x] <user>"
+ echo >&2 "Options: -c Stay in current directory even if target user is not root."
+ echo >&2 " -k Delegate Kerberos credentials even if target user is not root."
echo >&2 " -x Delegate X11 cookie even if target user is not root."
exit 1
fi
echo >&2 " -x Delegate X11 cookie even if target user is not root."
exit 1
fi
@@
-25,6
+28,7
@@
if [ -z "$uid" ]; then
fi
if [ $uid = 0 ]; then
fi
if [ $uid = 0 ]; then
+ chdir=1
kerberos=1
x11=1
fi
kerberos=1
x11=1
fi
@@
-37,12
+41,11
@@
BECOME="$HOME/.become"
profile="$BECOME/$user"
[ -f "$profile" ] || profile="$BECOME/all"
profile="$BECOME/$user"
[ -f "$profile" ] || profile="$BECOME/all"
-file="$(mktemp)"
-if [ -n "$file" ]; then
- exec 3>"$file"
- exec <"$file"
- rm "$file"
-
+file="${TMPDIR:-/tmp}/$USER.become.$user.$RANDOM.$$"
+umask=$(builtin umask -p)
+builtin umask 077
+if exec 3>"$file" && exec <"$file" && rm "$file"; then
+ builtin $umask
echo >&3 "cd"
echo >&3 "PROFILE_HOME='$HOME'"
if [ -n "$PRINCIPAL" ]; then
echo >&3 "cd"
echo >&3 "PROFILE_HOME='$HOME'"
if [ -n "$PRINCIPAL" ]; then
@@
-63,12
+66,16
@@
if [ -n "$file" ]; then
else
echo >&3 "unset DISPLAY"
fi
else
echo >&3 "unset DISPLAY"
fi
-
- echo >&3 2>/dev/null ". $HOME/.bash_profile"
- [ -f "$BECOME/all" ] && cat >&3 2>/dev/null "$BECOME/all"
- [ -f "$BECOME/$user" ] && cat >&3 2>/dev/null "$BECOME/$user"
+else
+ exit 111
fi
fi
+echo >&3 ". $HOME/.bash_profile"
+[ -f "$BECOME/all" ] && cat >&3 2>/dev/null "$BECOME/all"
+[ -f "$BECOME/$user" ] && cat >&3 2>/dev/null "$BECOME/$user"
+[ $chdir = 1 ] && echo >&3 2>/dev/null "cd - &>/dev/null"
+
+exec 3>&-
dir=$(dirname "$0")
[ "$dir" = "." ] && dir="$PWD"
exec sudo -H -u "$user" "$dir/became"
dir=$(dirname "$0")
[ "$dir" = "." ] && dir="$PWD"
exec sudo -H -u "$user" "$dir/became"