kdo: Upstream krb5 now supports kswitch

[Scripts/git/.git] / kerberos / kdo

diff --git a/kerberos/kdo b/kerberos/kdo
index 05b841eb4a815a15a3f52aacd6690946e9483fb4..b171c4b6d6b0d3de06da39dbf819f6beaeb53a7c 100644 (file)
--- a/kerberos/kdo
+++ b/kerberos/kdo
@@ -40,8 +40,8 @@
 # CONFIGURATION
 kdo_args=(-l15m -r60m -F)
 
-# CC interface for OS X
-if [ "Darwin" = "$(uname)" ]; then
+# CC interface for OS X or modern MIT krb5
+if type kswitch &>/dev/null; then
     kcaches () {
         klist -A | perl -ne '$cache = $1 if /^(?:Kerberos 5 ticket|Ticket|Credentials) cache: '\''?(.*)'\''?/; print "$1 $cache\n" if /^(?:Default p|P)rincipal: (.*)$/'
     }
@@ -64,7 +64,7 @@ fi
 
 # If kcaches and knewcache have been defined for this platform, then
 # setup kdo. Otherwise, add a helpful error.
-if hash kcaches &>/dev/null && hash knewcache &>/dev/null; then
+if type kcaches &>/dev/null && type knewcache &>/dev/null; then
     kfindcache () {
         kcaches | fgrep "$1" | cut -d' ' -f2-
     }
@@ -99,7 +99,9 @@ if hash kcaches &>/dev/null && hash knewcache &>/dev/null; then
                 COMPREPLY=($(compgen -c -- "${cur}"))
         esac
     }
-    complete -o bashdefault -F _kdo kdo
+    if type complete &>/dev/null; then
+        complete -o bashdefault -F _kdo kdo
+    fi
 
 else
     kdo () {