From eac670a60150e74ae34d1a41ff79e285460e9558 Mon Sep 17 00:00:00 2001 From: Barry Jaspan Date: Tue, 20 Aug 1996 17:34:51 +0000 Subject: [PATCH] * 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 --- src/kadmin/v4server/unit-test/ChangeLog | 5 +++++ src/kadmin/v4server/unit-test/Makefile.ov | 3 +-- src/kadmin/v4server/unit-test/helpers.exp | 18 ++++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog index 93120b8a4..01e193f60 100644 --- 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 + + * 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 * 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 3af65607e..7d48bcbc7 100644 --- 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 7f23b65c8..1b7c5685d 100644 --- 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" } } } -- 2.26.2