From: Paul Park <pjpark@mit.edu>
Date: Mon, 5 Jun 1995 20:14:54 +0000 (+0000)
Subject: Change kadmin5 password prompting order
X-Git-Tag: krb5-1.0-beta6~1853
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f16e11190c6642bc491f53e94bbb388ceeb14752;p=krb5.git

Change kadmin5 password prompting order

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 5eaf1c6e8..b1ddcfa08 100644
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,4 +1,8 @@
 
+Mon Jun 5 16:09:25 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* default.exp - Reverse prompting order for kadmin5.
+
+
 Thu Jun 1 14:48:57 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* default.exp - Change admin instance name to kadmin.
 
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 0d891d136..31f515a37 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -729,14 +729,14 @@ proc add_kerberos_key { kkey standalone } {
     }
     expect "kadmin5:"
     send "ank $kkey@KRBTEST.COM\r"
+    expect "Enter password for krbtest/kadmin@KRBTEST.COM:"
+    send "adminpass$KEY\r"
     expect "Enter new password for $kkey@KRBTEST.COM :"
     send "$kkey"
     send "$KEY\r"
     expect "Re-enter new password for $kkey@KRBTEST.COM :"
     send "$kkey"
     send "$KEY\r"
-    expect "Enter password for krbtest/kadmin@KRBTEST.COM:"
-    send "adminpass$KEY\r"
     expect {
 	"principal $kkey@KRBTEST.COM added" { }
 	"Principal $kkey@KRBTEST.COM already exists" { }
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 9fe619800..84f3fa8aa 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,4 +1,8 @@
 
+Mon Jun 5 16:10:15 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* kadmin.exp - Change prompting order for kadmin ank and kadmin cpw.
+
+
 Thu Jun 1 14:50:02 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* kadmin.exp: Change admin instance name to kadmin.
 
diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp
index 97cac286f..8e91bcf00 100644
--- a/src/tests/dejagnu/krb-standalone/kadmin.exp
+++ b/src/tests/dejagnu/krb-standalone/kadmin.exp
@@ -47,11 +47,11 @@ proc kadmin_add { pname password } {
 	    return 0
 	}
     }
-    expect "Enter new password for $pname :" { send "$password\r" }
-    expect "Re-enter new password for $pname :" { send "$password\r" }
     expect "Enter password for krbtest/kadmin@KRBTEST.COM:" {
 	send "adminpass$KEY\r"
     }
+    expect "Enter new password for $pname :" { send "$password\r" }
+    expect "Re-enter new password for $pname :" { send "$password\r" }
     expect "principal $pname added" { set good 1 }
     expect_after
     expect eof
@@ -140,11 +140,11 @@ proc kadmin_addv4 { pname password } {
 	    return 0
 	}
     }
-    expect "Enter new password for $pname :" { send "$password\r" }
-    expect "Re-enter new password for $pname :" { send "$password\r" }
     expect "Enter password for krbtest/kadmin@KRBTEST.COM:" {
 	send "adminpass$KEY\r"
     }
+    expect "Enter new password for $pname :" { send "$password\r" }
+    expect "Re-enter new password for $pname :" { send "$password\r" }
     expect "principal $pname added" { set good 1 }
     expect_after
     expect eof
@@ -346,11 +346,11 @@ proc kadmin_cpw { pname password } {
 	    return 0
 	}
     }
-    expect "Enter new password for $pname:" { send "$password\r" }
-    expect "Re-enter new password for $pname:" { send "$password\r" }
     expect "Enter password for krbtest/kadmin@KRBTEST.COM:" {
 	send "adminpass$KEY\r"
     }
+    expect "Enter new password for $pname:" { send "$password\r" }
+    expect "Re-enter new password for $pname:" { send "$password\r" }
     # When in doubt, jam one of these in there.
     expect "\r"
     expect "password changed for $pname"