X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fkrb5.bashrc;h=586f80dbbb3dabf0a5cd83abcdc10abbe4220b17;hp=12b8ea1b0a7fa0835da4e9be9abd7f01ba101d99;hb=8a304871323fd8c0ab81b81a9082f07d03a1fa0c;hpb=51f2ae45a937406379d3bc0e809bc72bcedd7352

diff --git a/.profile.d/krb5.bashrc b/.profile.d/krb5.bashrc
index 12b8ea1..586f80d 100644
--- a/.profile.d/krb5.bashrc
+++ b/.profile.d/krb5.bashrc
@@ -1,12 +1,55 @@
-# $Id$
 alias kssh='ssh -o preferredauthentications=gssapi-with-mic'
 alias pssh='ssh -o preferredauthentications=password,keyboard-interactive'
-if [ $UID -gt 0 ]; then
+
+if [ $UID -gt 0 -a -z "$OLDSOLARIS" -a -z "$OLDREDHAT" ]; then
   if tty -s; then
-    if klist -s; then
-      kinit -R
+    if klist -s 2>/dev/null; then
+      # We already have a ticket cache.  Renew it.
+      kinit -R &>/dev/null
     else
-      kinit
+      # Try to find an existing cache but only if we are using FILE: caches.
+      default=$((unset KRB5CCNAME; klist 2>&1) | sed -n 's/.*FILE:\([^)]*\).*/\1/p')
+      if [ ! -z "$default" ]; then
+        # Check for bogus FILE: KRB5CCNAME.
+        if [ ! -z "$KRB5CCNAME" -a "${KRB5CCNAME##*:}" = "$KRB5CCNAME" ]; then 
+          export KRB5CCNAME="FILE:$KRB5CCNAME"
+        fi
+
+        # Find the file.
+        ccname="${KRB5CCNAME##FILE:}"
+        if [ "$ccname" = "$KRB5CCNAME" ]; then
+          # Our cache isn't a file cache.  Throw it away.
+          ccname="$default"
+          unset KRB5CCNAME
+        fi
+
+        # Remember if nullglob was on.
+        shopt -q nullglob
+        ng=$?
+        # Turn it on so we can look for caches safely.
+        shopt -s nullglob
+
+        for cache in $default*; do
+          if klist -s -c "$cache"; then
+            if [ ! "$cache" = "$ccname" ]; then
+              # It may not be safe to simply point the environment to this 
+              # cache as it may belong to a session which is about to end.  
+              # Therefore we copy it.
+              cp -p "$cache" "$ccname" || continue
+            fi
+            kinit -R &>/dev/null
+            break
+          fi
+        done
+
+        # Maybe turn nocaseglob back off.
+        [ $ng = 0 ] || shopt -u nullglob
+      fi
     fi
+
+    # By now we should have found a cache if there's one to find.
+    klist -s 2>/dev/null || kinit
   fi
 fi
+
+unset cache ccname default ng