X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fkrb5.bashrc;h=9c56dda0baad256d8a16b32c24bb805f6468970f;hp=034dadd8231ba6c4f4e0cce5dac8cdd95a103ca7;hb=48f30af664cf57c765a763eea7c652da92d66c27;hpb=77db9042493a3b6adab6e2e95baedc3e691a4212

diff --git a/.profile.d/krb5.bashrc b/.profile.d/krb5.bashrc
index 034dadd..9c56dda 100644
--- a/.profile.d/krb5.bashrc
+++ b/.profile.d/krb5.bashrc
@@ -3,7 +3,12 @@ alias pssh='ssh -o preferredauthentications=password,keyboard-interactive'
 
 unalias kinit 2>/dev/null
 if [ 1 = 0 -a -z "$OLDSOLARIS" -a -z "$OLDREDHAT" ]; then
-  if tty -s; then
+  if [ -t 0 ]; then
+    # Canonicalise the cache name.
+    if [ -n "$KRB5CCNAME" -a "${KRB5CCNAME##*:}" = "$KRB5CCNAME" ]; then
+      export KRB5CCNAME="FILE:$KRB5CCNAME"
+    fi
+
     if [ ! "$SUDO_UID" ]; then
       if klist -s 2>/dev/null; then
         # We already have a ticket cache.  Renew it.