* standalone.exp: Only run the keytab to srvtab tests if kerberos 4

        support is compiled into the source tree.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15076 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index a7d8e0f1380752cc54dc818e9558ba117f6caaaf..fe3f185a6b1801532ed327cf9f19c593a06b6a62 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-01  Ezra Peisach  <epeisach@bu.edu>
+
+       * standalone.exp: Only run the keytab to srvtab tests if kerberos 4
+       support is compiled into the source tree.
+
 2002-09-30  Tom Yu  <tlyu@mit.edu>
 
        * rsh.exp (rsh_test): Explicitly call stop_rsh_daemon upon pass

diff --git a/src/tests/dejagnu/krb-standalone/standalone.exp b/src/tests/dejagnu/krb-standalone/standalone.exp
index e493b65fe42005b4bcd8a268c26022a4fdbfe291..dbe9b950c43cda5a35b4e93255fcfadd80def105 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/standalone.exp
+++ b/src/tests/dejagnu/krb-standalone/standalone.exp
@@ -30,6 +30,7 @@ proc doit { } {
     global tmppwd
     global spawn_id
     global supported_enctypes
+    global KRBIV
 
     # Start up the kerberos and kadmind daemons.
     if ![start_kerberos_daemons 1] {
@@ -81,7 +82,8 @@ proc doit { } {
        do_klist "foo/bar" "krbtgt/$REALMNAME@$REALMNAME" "klist kt foo/bar vno $vno"
        do_kdestroy "kdestroy foo/bar vno $vno"
        
-       if [regexp {des-cbc-[a-z0-9-]*:v4} [lindex $supported_enctypes 0]] {
+       if {[info exists KRBIV] && $KRBIV &&
+           [regexp {des-cbc-[a-z0-9-]*:v4} [lindex $supported_enctypes 0]]} {
            catch "exec rm -f $tmppwd/foosrvtab"
            spawn $KTUTIL
            expect_after {