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 5eaf1c6e88e5732a457716a0161dc27484d85288..b1ddcfa08bec7b8de2efe91200869b4ef956b402 100644 (file)
--- 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 0d891d136dae76097e5247c087eeb3ef4d0d61d2..31f515a375c43ad11a974a703ba758de5636ee40 100644 (file)
--- 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 9fe6198005ac7bb39b9de4f99f69d8c0b0c3a8cf..84f3fa8aaccd8fd66256e2de8e9d4ff32dbac809 100644 (file)
--- 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 97cac286f5add3d61e5cfa6a452067cebc4f3795..8e91bcf00e0055f1f5a50dbed7a200d5aba39bd2 100644 (file)
--- 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"