* Makefile.ov, helpers.exp, v4server.1/change-password.exp: use

 	kadmin.local instead of kdb5_edit

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

diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog
index 93120b8a41af46bbb67305d20d1e6b595c788e74..01e193f602fa314ddcc2895705d6586efc73015c 100644 (file)
--- a/src/kadmin/v4server/unit-test/ChangeLog
+++ b/src/kadmin/v4server/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 20 13:33:29 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * Makefile.ov, helpers.exp, v4server.1/change-password.exp: use
+       kadmin.local instead of kdb5_edit
+
 Mon Jul 15 17:15:51 1996  Marc Horowitz  <marc@mit.edu>
 
        * helpers.exp (exp_prog): the check for non-newline-terminated

diff --git a/src/kadmin/v4server/unit-test/Makefile.ov b/src/kadmin/v4server/unit-test/Makefile.ov
index 3af65607ed066519943e4de4fa01542e272bda90..7d48bcbc77e69d9ce4ae7454058ae58d2cc5e4ce 100644 (file)
--- a/src/kadmin/v4server/unit-test/Makefile.ov
+++ b/src/kadmin/v4server/unit-test/Makefile.ov
@@ -12,8 +12,7 @@ unit-test-setup::
        $(LOCAL_MAKE_KEYTAB) -princ changepw/kerberos /krb5/ovsec_adm.srvtab
 
 unit-test-body::
-       $(RUNTEST) VFOURSERVER=../kadmind4 --tool v4server \
-               KDBFIVE_EDIT=../../../admin/edit/kdb5_edit
+       $(RUNTEST) VFOURSERVER=../kadmind4 --tool v4server
 
 unit-test-cleanup::
        $(STOP_SERVERS_LOCAL) -v4files

diff --git a/src/kadmin/v4server/unit-test/helpers.exp b/src/kadmin/v4server/unit-test/helpers.exp
index 7f23b65c8fafdd94c4929c0a888f3b68cf071cab..1b7c5685df1550dc8ce3462a2817449491edc3e0 100644 (file)
--- a/src/kadmin/v4server/unit-test/helpers.exp
+++ b/src/kadmin/v4server/unit-test/helpers.exp
@@ -190,16 +190,22 @@ proc exp_prog { name prog cmdline status args } {
 }
 
 proc fix_salt { name fullname oldpw newpw } {
-       global kdb5_edit
+       global kadmin_local
 
-       exp_prog "$name: kdb5_edit" $kdb5_edit "" 0 {
-               "kdb5_edit:" { send "cpw $fullname\n" }
+       exp_prog "$name: kadmin.local" $kadmin_local "" 0 {
+               "kadmin.local:" { send "cpw $fullname\n" }
        } {
-               "Enter password:" { send "$newpw\n" }
+               "Enter password for principal \"$fullname\":" { 
+                   send "$newpw\n" 
+               }
        } {
-               "Re-enter password for verification:" { send "$newpw\n" }
+               "Re-enter password for principal \"$fullname\":" { 
+                   send "$newpw\n"
+               }
        } {
-               "kdb5_edit:" { send "quit\n" }
+               # if we get cannot reuse pw, the salt is already right
+               -re "Password .* changed." { send "quit\n" }
+               -re "Cannot reuse password" { send "quit\n" }
        }
 }