* kadmin.exp: Fix to deal with new kpasswd program

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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 9fec32bf8d9f95e9778857188c3cbbff5a2a3e8b..c14687e49e35bdecece26d45f067d0f986f8038b 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 30 23:49:54 1998  Tom Yu  <tlyu@mit.edu>
+
+       * kadmin.exp: Fix to deal with new kpasswd program.
+
 Sun Nov  9 10:07:07 1997  Ezra Peisach  <epeisach@mit.edu>
 
        * gssftp.exp: Replace "else if" with "elseif" as expect 5.25

diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp
index 894af7cb1051be0ed2b0eb9394da6217bcf8b4e1..d09b4419ddf471137c1e3f2b5d1b9fefaf5354c4 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/kadmin.exp
+++ b/src/tests/dejagnu/krb-standalone/kadmin.exp
@@ -12,7 +12,7 @@ if {![get_hostname] \
 
 # find kpasswd
 if ![info exists KPASSWD] {
-    set KPASSWD [findfile $objdir/../../kadmin/passwd/kpasswd]
+    set KPASSWD [findfile $objdir/../../clients/kpasswd/kpasswd]
 }
 
 # find kdestroy
@@ -607,27 +607,31 @@ proc kadmin_delete { pname } {
 #--
 proc kpasswd_cpw { princ opw npw } {
     global KPASSWD
+    global REALMNAME
 
     spawn $KPASSWD $princ
     expect_after {
        timeout {
            fail "kpasswd $princ $npw"
-           catch "expect_after"
+#          catch "expect_after"
            return 0
        }
        eof {
            fail "kpasswd $princ $npw"
-           catch "expect_after"
+#          catch "expect_after"
            return 0
        }
     }
 
-    expect "Changing password for $princ."
-    expect "Old password:" { send "$opw\r" }
-    expect "New password:" { send "$npw\r" }
-    expect "New password (again):" { send "$npw\r" }
-    expect "\r"
-    expect "Kerberos password changed."
+#    expect "Changing password for $princ."
+#    expect "Old password:" { send "$opw\r" }
+#    expect "New password:" { send "$npw\r" }
+#    expect "New password (again):" { send "$npw\r" }
+    expect "Password for $princ@$REALMNAME:" { send "$opw\r" }
+    expect "Enter new password:"  { send "$npw\r" }
+    expect "Enter it again:"      { send "$npw\r" }
+#    expect "Kerberos password changed."
+    expect "Password changed."
     expect_after
     expect eof