diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-08-20 17:47:53 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-08-20 17:47:53 +0000 |
| commit | b6d4b37d4ecf0ed833ac3262a3c3316c9f0c758f (patch) | |
| tree | b3d8d7ef14e508ea91ad4402a46a51d1fe7bf333 /src/lib | |
| parent | 2ceb8a1fc71acfc0aa6c703f9549006a1ba1ded9 (diff) | |
| download | krb5-b6d4b37d4ecf0ed833ac3262a3c3316c9f0c758f.tar.gz krb5-b6d4b37d4ecf0ed833ac3262a3c3316c9f0c758f.tar.xz krb5-b6d4b37d4ecf0ed833ac3262a3c3316c9f0c758f.zip | |
* 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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/unit-test/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/kadm5/unit-test/Makefile.ov | 2 | ||||
| -rw-r--r-- | src/lib/kadm5/unit-test/api.0/init.exp | 12 | ||||
| -rw-r--r-- | src/lib/kadm5/unit-test/api.2/init.exp | 12 | ||||
| -rw-r--r-- | src/lib/kadm5/unit-test/config/unix.exp | 1 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 6e2baca5d..96ef0474b 100644 --- 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 d0c277afe..0156d7c93 100644 --- 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 5df5dcfc9..03b9284fd 100644 --- 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 97a99e0ba..ef9573c67 100644 --- 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 e9a681f93..7b8e2ea4f 100644 --- 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 |