X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=opt%2Fbin%2Fbecome;h=f39fc49edf94fddce7399ca0e70848ab5944198e;hb=24473107a8819cc3b2d34d0a2e681a94b674d5bb;hp=b6b2f2064da8ae8e01cb7ff015a98fe5f0401023;hpb=484d06da67a028c69e6ede83479b1bdbeccd5749;p=profile.git

diff --git a/opt/bin/become b/opt/bin/become
index b6b2f20..f39fc49 100755
--- a/opt/bin/become
+++ b/opt/bin/become
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+chdir=0
 kerberos=0
 x11=0
 while getopts ":kx" opt; do
   case $opt in
+    c) chdir=1;;
     k) kerberos=1;;
     x) x11=1;;
   esac
@@ -12,8 +14,9 @@ shift $((OPTIND-1))
 
 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
@@ -25,6 +28,7 @@ if [ -z "$uid" ]; then
 fi
 
 if [ $uid = 0 ]; then
+  chdir=1
   kerberos=1
   x11=1
 fi
@@ -49,6 +53,7 @@ if exec 3>"$file" && exec <"$file" && rm "$file"; then
     if [ $kerberos = 1 ]; then
       ccname=$(klist 2>/dev/null | sed -n 's/^Ticket cache: FILE://p')
       if [ -f "$ccname" ]; then
+        echo >&3 "export KRB5CCNAME='$KRB5CCNAME'"
         openssl=$(find_working openssl)
         if [ -n "$openssl" ]; then
           echo >&3 "KRB5OPENSSL='$openssl'"
@@ -69,6 +74,7 @@ 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")