From 2ceb8a1fc71acfc0aa6c703f9549006a1ba1ded9 Mon Sep 17 00:00:00 2001 From: Barry Jaspan Date: Tue, 20 Aug 1996 17:35:13 +0000 Subject: [PATCH] * unix.exp: use kadmin.local instead of kdb5_edit git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8957 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/v4server/unit-test/config/ChangeLog | 4 ++++ src/kadmin/v4server/unit-test/config/unix.exp | 1 - src/kadmin/v4server/unit-test/v4server.1/change-password.exp | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kadmin/v4server/unit-test/config/ChangeLog b/src/kadmin/v4server/unit-test/config/ChangeLog index aa01abc17..ef27f8d69 100644 --- a/src/kadmin/v4server/unit-test/config/ChangeLog +++ b/src/kadmin/v4server/unit-test/config/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 20 13:34:07 1996 Barry Jaspan + + * unix.exp: use kadmin.local instead of kdb5_edit + Mon Jul 15 17:18:56 1996 Marc Horowitz * unix.exp: some versions of runtest do not like digits in diff --git a/src/kadmin/v4server/unit-test/config/unix.exp b/src/kadmin/v4server/unit-test/config/unix.exp index 874092311..c27b3c339 100644 --- a/src/kadmin/v4server/unit-test/config/unix.exp +++ b/src/kadmin/v4server/unit-test/config/unix.exp @@ -11,7 +11,6 @@ if {[file exists /bin/sleep]} { set kpasswd_v4 /usr/athena/bin/kpasswd set ovpasswd $env(TOP)/kpasswd/kpasswd set kadmin_local $env(TOP)/cli/kadmin.local -set kdb5_edit $KDBFIVE_EDIT set remove_changepw_perms ./remove_changepw_perms.sh set getpid ./getpid.sh set ovsec_adm_server $env(TOP)/server/kadmind diff --git a/src/kadmin/v4server/unit-test/v4server.1/change-password.exp b/src/kadmin/v4server/unit-test/v4server.1/change-password.exp index 62b9ec30a..cc8e08406 100644 --- a/src/kadmin/v4server/unit-test/v4server.1/change-password.exp +++ b/src/kadmin/v4server/unit-test/v4server.1/change-password.exp @@ -47,8 +47,9 @@ kpasswd_v4 CPW.6 pol1 -1 polAAAAAA pol111111 { "$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break } } -# this relies on the fact that kdb5_edit resets last_pwd_change, which -# it appears to +# We used to use kdb5_edit, which reset last_pwd_change. Now we used +# kadmin.local, which doesn't, so we have to wait out the min life. +exec $sleep 30 kpasswd_v4 CPW.7.setup pol2 0 pol222222 polBBBBBB { "Password changed." {} } kpasswd_v4 CPW.7 pol2 -1 polBBBBBB pol222222 { "Password cannot be changed because it was changed too recently." {} -- 2.26.2