From 21b4558b5819c177272fe350dde5bf0a9670cfbc Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sat, 31 Jan 1998 04:51:05 +0000
Subject: [PATCH] 	* kadmin.exp: Fix to deal with new kpasswd program

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10398 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/tests/dejagnu/krb-standalone/ChangeLog  |  4 ++++
 src/tests/dejagnu/krb-standalone/kadmin.exp | 22 ++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 9fec32bf8..c14687e49 100644
--- 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 894af7cb1..d09b4419d 100644
--- 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
 
-- 
2.26.2