X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fkrb5.bashrc;h=034dadd8231ba6c4f4e0cce5dac8cdd95a103ca7;hb=9da18ed22b25eaffe868fd6e68a60035bcdf3063;hp=9938a30ce51b9b82e0ef997afd3eabb538197298;hpb=f5a7e98a8d77bd6a74ba040266016f369ca4e2dc;p=profile.git

diff --git a/.profile.d/krb5.bashrc b/.profile.d/krb5.bashrc
index 9938a30..034dadd 100644
--- a/.profile.d/krb5.bashrc
+++ b/.profile.d/krb5.bashrc
@@ -2,7 +2,7 @@ alias kssh='ssh -o preferredauthentications=gssapi-with-mic'
 alias pssh='ssh -o preferredauthentications=password,keyboard-interactive'
 
 unalias kinit 2>/dev/null
-if [ -z "$OLDSOLARIS" -a -z "$OLDREDHAT" ]; then
+if [ 1 = 0 -a -z "$OLDSOLARIS" -a -z "$OLDREDHAT" ]; then
   if tty -s; then
     if [ ! "$SUDO_UID" ]; then
       if klist -s 2>/dev/null; then
@@ -86,4 +86,12 @@ if [ -z "$OLDSOLARIS" -a -z "$OLDREDHAT" ]; then
 fi
 
 unset cache ccname default ng
-alias kinit='( builtin cd /; exec -c kinit )'
+function kinit() {
+  local args=
+  local krb5ccname=
+  if [ -n "$KRB5CCNAME" ]; then
+    args="$@"
+    [ "${args/-c /}" = "$args" ] && krb5ccname="-c $KRB5CCNAME"
+  fi
+  ( builtin cd /; exec -c kinit $krb5ccname ${1+"$@"} )
+}