update to krb5 script: check krytab for root.

diff --git a/lustre/tests/krb5_env.sh b/lustre/tests/krb5_env.sh
index 5414ec8..fdd81d3 100755 (executable)
--- a/lustre/tests/krb5_env.sh
+++ b/lustre/tests/krb5_env.sh
@@ -56,6 +56,20 @@ prepare_krb5_cache() {
         return 0
     fi
 
         return 0
     fi
 

+    #
+    # check installed service keytab for root
+    #
+    if [ $UID -eq 0 ]; then
+        output=`$KRB5DIR/bin/klist -5 -k`
+        if [ $? == 0 ]; then
+            item=`echo $output | egrep "lustre_mds/.*@"`
+            if [ "x$item" != "x" ]; then
+                echo "Using service keytab"
+                return 0
+            fi
+        fi
+    fi
+

     echo "***** refresh Kerberos V5 TGT for uid $UID *****"
     $KRB5DIR/bin/kinit
     ret=$?
     echo "***** refresh Kerberos V5 TGT for uid $UID *****"
     $KRB5DIR/bin/kinit
     ret=$?

diff --git a/lustre/tests/krb5_refresh_cache.sh b/lustre/tests/krb5_refresh_cache.sh
index b356306..2adfadc 100755 (executable)
--- a/lustre/tests/krb5_refresh_cache.sh
+++ b/lustre/tests/krb5_refresh_cache.sh
@@ -9,6 +9,20 @@ if [ $invalid -eq 0 ]; then
     exit 0
 fi
 
     exit 0
 fi
 

+#
+# check installed service keytab for root
+#
+if [ $UID -eq 0 ]; then
+    output=`$KRB5DIR/bin/klist -5 -k`
+    if [ $? == 0 ]; then
+        item=`echo $output | egrep "lustre_mds/.*@"`
+        if [ "x$item" != "x" ]; then
+            echo "Using service keytab"
+            exit 0
+        fi
+    fi
+fi
+

 echo "***** refresh Kerberos V5 TGT for uid $UID *****"
 $KRB5DIR/bin/kinit
 ret=$?
 echo "***** refresh Kerberos V5 TGT for uid $UID *****"
 $KRB5DIR/bin/kinit
 ret=$?