summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>2003-01-01 15:22:21 +0000
committerEzra Peisach <epeisach@mit.edu>2003-01-01 15:22:21 +0000
commiteae580439eff0e6922867c93dd9c43037865ad48 (patch)
treefb9fb527c072a342282eda29cdc5ad7ba5fa642f /src
parent0ec2f8bdb674e49958b0d2b9268d1bb12e533b66 (diff)
* 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
Diffstat (limited to 'src')
-rw-r--r--src/tests/dejagnu/krb-standalone/ChangeLog5
-rw-r--r--src/tests/dejagnu/krb-standalone/standalone.exp4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index a7d8e0f13..fe3f185a6 100644
--- 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 e493b65fe..dbe9b950c 100644
--- 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 {