diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-09-26 21:53:34 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-09-26 21:53:34 +0000 |
| commit | 77529ef21b563bd90d7a44082d4b4777c339ec2d (patch) | |
| tree | 1c8b4db704d59d58d89fe51066982b975e37ce3a /src/kadmin/v4server/unit-test | |
| parent | e34eaf69afd580162b881422d6acfc744e58e9cb (diff) | |
| download | krb5-77529ef21b563bd90d7a44082d4b4777c339ec2d.tar.gz krb5-77529ef21b563bd90d7a44082d4b4777c339ec2d.tar.xz krb5-77529ef21b563bd90d7a44082d4b4777c339ec2d.zip | |
* Makefile.in, remove_changepw_perms.sh, lib/helpers.exp,
vrserver.0/setup-srvtab.exp, v4server.1/access.exp: use $K5ROOT
instead of /krb5
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9124 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v4server/unit-test')
6 files changed, 14 insertions, 7 deletions
diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog index 0c3926ea07..741f5de8ae 100644 --- a/src/kadmin/v4server/unit-test/ChangeLog +++ b/src/kadmin/v4server/unit-test/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 26 17:52:21 1996 Barry Jaspan <bjaspan@mit.edu> + + * Makefile.in, remove_changepw_perms.sh, lib/helpers.exp, + vrserver.0/setup-srvtab.exp, v4server.1/access.exp: use $K5ROOT + instead of /krb5 + Mon Sep 23 15:34:56 1996 Barry Jaspan <bjaspan@mit.edu> * adapt to krb5 build system: create Makefile.in, configure.in, diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in index 3701b504a6..0022556f4b 100644 --- a/src/kadmin/v4server/unit-test/Makefile.in +++ b/src/kadmin/v4server/unit-test/Makefile.in @@ -6,7 +6,6 @@ check unit-test:: unit-test-setup unit-test-body unit-test-cleanup unit-test-setup:: $(ENV_SETUP) $(START_SERVERS_LOCAL) -v4files -kdcport 750 -keysalt des-cbc-crc:v4 - $(ENV_SETUP) $(LOCAL_MAKE_KEYTAB) -princ changepw/kerberos /krb5/ovsec_adm.srvtab unit-test-body:: $(ENV_SETUP) $(RUNTEST) VFOURSERVER=../kadmind4 --tool v4server diff --git a/src/kadmin/v4server/unit-test/lib/helpers.exp b/src/kadmin/v4server/unit-test/lib/helpers.exp index 1b7c5685df..0b7b0eea26 100644 --- a/src/kadmin/v4server/unit-test/lib/helpers.exp +++ b/src/kadmin/v4server/unit-test/lib/helpers.exp @@ -56,7 +56,7 @@ proc myfail { msg } { } proc server_start { name cmdline should_listen args } { - global spawn_id server_id + global spawn_id server_id env global VFOURSERVER global mytest_status global sleep hostname @@ -71,7 +71,7 @@ proc server_start { name cmdline should_listen args } { verbose "Couldn't connect to V4 kpasswd server; retrying ($num_tries so far)." } - spawn $VFOURSERVER $cmdline + spawn $VFOURSERVER -k $env(K5ROOT)/ovsec_adm.srvtab $cmdline set server_id $spawn_id foreach test $args { diff --git a/src/kadmin/v4server/unit-test/remove_changepw_perms.sh b/src/kadmin/v4server/unit-test/remove_changepw_perms.sh index 27d026ff32..2269318017 100644 --- a/src/kadmin/v4server/unit-test/remove_changepw_perms.sh +++ b/src/kadmin/v4server/unit-test/remove_changepw_perms.sh @@ -2,7 +2,7 @@ # tcl sucks big fat hairy rocks -ed /krb5/ovsec_adm.acl <<EOF >/dev/null 2>&1 +ed $K5ROOT/ovsec_adm.acl <<EOF >/dev/null 2>&1 g/changepw\/kerberos/s/^/#/ w q diff --git a/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp b/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp index f908ff44ba..edba87b7a0 100644 --- a/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp +++ b/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp @@ -9,7 +9,7 @@ exp_prog "setup" $kadmin_local "" 0 { "already exists" {} } { "kadmin.local:" { - send "ktadd -k /krb5/ovsec_adm.srvtab changepw/kerberos\n" + send "ktadd -k $env(K5ROOT)/ovsec_adm.srvtab changepw/kerberos\n" } } { -re "Entry for principal changepw/kerberos .* added to keytab" { diff --git a/src/kadmin/v4server/unit-test/v4server.1/access.exp b/src/kadmin/v4server/unit-test/v4server.1/access.exp index 4d30fc9c73..f46b960b8c 100644 --- a/src/kadmin/v4server/unit-test/v4server.1/access.exp +++ b/src/kadmin/v4server/unit-test/v4server.1/access.exp @@ -17,7 +17,7 @@ proc kill_admin_server {} { } proc start_admin_server {} { - global ovsec_adm_server sleep + global ovsec_adm_server sleep env set max_tries 60 @@ -44,10 +44,12 @@ proc remove_changepw_perms {} { } proc set_changepw_perms { perms } { + global env + remove_changepw_perms exec echo "changepw/kerberos@SECURE-TEST.OV.COM $perms" \ - >> /krb5/ovsec_adm.acl + >> $env(K5ROOT)/ovsec_adm.acl } # start off with a dead admin server |