* api.0/init.exp, api.2/init.exp, config/unix.exp, Makefile.ov:

 	use kadmin.local instead of kdb5_edit

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

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 6e2baca5dcf41bb9f6b8798ffa5447d131a7c762..96ef0474be91e1b4d6a912558a1605b1de387f2c 100644 (file)
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 20 13:46:54 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * api.0/init.exp, api.2/init.exp, config/unix.exp, Makefile.ov:
+       use kadmin.local instead of kdb5_edit
+
 Fri Aug 16 17:16:46 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * Makefile.ov: update for new lib/kadm5 layout

diff --git a/src/lib/kadm5/unit-test/Makefile.ov b/src/lib/kadm5/unit-test/Makefile.ov
index d0c277afe68781412bb3ce743ad3791ea9b7e9a5..0156d7c93c56166b159a84fcff7c763623d59b0b 100644 (file)
--- a/src/lib/kadm5/unit-test/Makefile.ov
+++ b/src/lib/kadm5/unit-test/Makefile.ov
@@ -132,7 +132,7 @@ capi.2: api.2
        ln -s api.2 capi.2
 
 unit-test-client-body: capi.0 capi.2 site.exp test-noauth test-destroy test-handle-client test-sizes
-       $(RUNTEST) --tool capi API=$(CLNTTCL) KDBFIVE_EDIT=$(TOP)/../admin/edit/kdb5_edit KINIT=$(TOP)/../clients/kinit/kinit KDESTROY=$(TOP)/../clients/kdestroy/kdestroy KADMIN_LOCAL=$(TOP)/cli/kadmin.local TOP=$(TOP) RPC=1
+       $(RUNTEST) --tool capi API=$(CLNTTCL) KINIT=$(TOP)/../clients/kinit/kinit KDESTROY=$(TOP)/../clients/kdestroy/kdestroy KADMIN_LOCAL=$(TOP)/cli/kadmin.local TOP=$(TOP) RPC=1
 
 sapi.0: api.0
        -rm -f sapi.0

diff --git a/src/lib/kadm5/unit-test/api.0/init.exp b/src/lib/kadm5/unit-test/api.0/init.exp
index 5df5dcfc944f95cea771fd0e00a1e02cd7087407..03b9284fdbeb793a1fd426ae080919c6851818bb 100644 (file)
--- a/src/lib/kadm5/unit-test/api.0/init.exp
+++ b/src/lib/kadm5/unit-test/api.0/init.exp
@@ -681,15 +681,13 @@ test42
 
 
 proc test45_46 {service} {
-    global test kdb5_edit env
+    global test kadmin_local env
 
-    spawn $kdb5_edit -R "del $service"
+    spawn $kadmin_local -q "delprinc -force $service"
     expect {
-       {Type 'yes' to confirm:} {
-           send "yes\n"
-       }
+       -re "Principal .* deleted." {}
        default {
-           error "kdb5_edit del failed\n";
+           error "kadmin.local delprinc failed\n";
        }
     }
     expect eof
@@ -701,7 +699,7 @@ proc test45_46 {service} {
            server_handle}] "SECURE_PRINC_MISSING"
 
     # this leaves the keytab with an incorrect entry
-    exec $kdb5_edit -R "ark $service"
+    exec $kadmin_local -q "ank -randkey $service"
 
     # restart the api so it gets a new ccache
     api_exit

diff --git a/src/lib/kadm5/unit-test/api.2/init.exp b/src/lib/kadm5/unit-test/api.2/init.exp
index 97a99e0baaf8175d6b9881b6388cfd0a1473baf3..ef9573c6709b0e2e28209a21893100b9ffbd9ad8 100644 (file)
--- a/src/lib/kadm5/unit-test/api.2/init.exp
+++ b/src/lib/kadm5/unit-test/api.2/init.exp
@@ -685,15 +685,13 @@ test42
 
 
 proc test45_46 {service} {
-    global test kdb5_edit env
+    global test kadmin_local env
 
-    spawn $kdb5_edit -R "del $service"
+    spawn $kadmin_local -q "delprinc -force $service"
     expect {
-       {Type 'yes' to confirm:} {
-           send "yes\n"
-       }
+       -re "Principal .* deleted." {}
        default {
-           error "kdb5_edit del failed\n";
+           error "kadmin.local delprinc failed\n";
        }
     }
     expect eof
@@ -705,7 +703,7 @@ proc test45_46 {service} {
            server_handle}] "SECURE_PRINC_MISSING"
 
     # this leaves the keytab with an incorrect entry
-    exec $kdb5_edit -R "ark $service"
+    exec $kadmin_local -q "ank -randkey $service"
 
     # restart the api so it gets a new ccache
     api_exit

diff --git a/src/lib/kadm5/unit-test/config/unix.exp b/src/lib/kadm5/unit-test/config/unix.exp
index e9a681f935c257182200bfb2375c15f9bd64e7cc..7b8e2ea4f75cf7870a937e9c10e4b85578c6e48d 100644 (file)
--- a/src/lib/kadm5/unit-test/config/unix.exp
+++ b/src/lib/kadm5/unit-test/config/unix.exp
@@ -1,5 +1,4 @@
 set stty_init {-onlcr -opost intr \^C kill \^U}
-set kdb5_edit $KDBFIVE_EDIT
 set kadmin_local $KADMIN_LOCAL
 
 # Backward compatibility until we're using expect 5 everywhere