summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Park <pjpark@mit.edu>1995-06-05 20:14:54 +0000
committerPaul Park <pjpark@mit.edu>1995-06-05 20:14:54 +0000
commitf16e11190c6642bc491f53e94bbb388ceeb14752 (patch)
tree23dcd263cd6b9a6967a5e853a3ce364bc15f7d5c /src
parent1e886a99026a61f77c5e5281c55517da8ad5176c (diff)
downloadkrb5-f16e11190c6642bc491f53e94bbb388ceeb14752.tar.gz
krb5-f16e11190c6642bc491f53e94bbb388ceeb14752.tar.xz
krb5-f16e11190c6642bc491f53e94bbb388ceeb14752.zip
Change kadmin5 password prompting order
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5950 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/tests/dejagnu/config/ChangeLog4
-rw-r--r--src/tests/dejagnu/config/default.exp4
-rw-r--r--src/tests/dejagnu/krb-standalone/ChangeLog4
-rw-r--r--src/tests/dejagnu/krb-standalone/kadmin.exp12
4 files changed, 16 insertions, 8 deletions
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"