revert 21003

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21004 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-08 01:53:10 +00:00
parent 12df8538af
commit 9df9f6a9da
46 changed files with 58 additions and 229 deletions

View File

@@ -43,12 +43,8 @@ testfailed="echo test failed; cat messages.log; exit 1"
# If there is no useful db support compile in, disable test
../db/have-db || exit 77
exit 77
R=TEST.H5L.SE
R2=SUB.TEST.H5L.SE
service=ldap/host.sub.test.h5l.se
R2=TEST2.H5L.SE
port=@port@
@@ -63,6 +59,7 @@ kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog"
KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG
@@ -87,8 +84,6 @@ ${kadmin} \
${kadmin} add -p foo --use-defaults foo@${R} || exit 1
${kadmin} modify --alias=alias1 --alias=alias2 foo@${R} || exit 1
${kadmin} add -p foo --use-defaults ${service}@${R2} || exit 1
${kadmin} add -p cross1 --use-defaults krbtgt/${R2}@${R} || exit 1
${kadmin} add -p cross2 --use-defaults krbtgt/${R}@${R2} || exit 1
@@ -112,14 +107,6 @@ trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
ec=0
echo "Getting client (no canon)"; > messages.log
${kinit} --password-file=${objdir}/foopassword foo@${R} || \
{ ec=1 ; eval "${testfailed}"; }
echo "checking that we go back right principal"
${klist} | grep "Principal: foo@${R}" > /dev/null || \
{ ec=1 ; eval "${testfailed}"; }
${kdestroy}
echo "Getting client alias1 tickets"; > messages.log
${kinit} --canonicalize \
--password-file=${objdir}/foopassword alias1@${R}@${R} || \
@@ -154,32 +141,6 @@ echo "Remove alias"
${kadmin} modify --alias= foo@${R} || { ec=1 ; eval "${testfailed}"; }
echo "Getting client for ${service}@${R} (kdc referral)"
> messages.log
${kinit} --password-file=${objdir}/foopassword foo@${R} || \
{ ec=1 ; eval "${testfailed}"; }
${kgetcred} --server ${service}@${R} ||
{ ec=1 ; eval "${testfailed}"; }
${klist}
echo "checking that we go back right principal"
${klist} | grep "${service}@${R2}" > /dev/null || \
{ ec=1 ; eval "${testfailed}"; }
${kdestroy}
echo "Getting client for ${service}@${R2} (client side guessing)"
> messages.log
${kinit} --password-file=${objdir}/foopassword foo@${R} || \
{ ec=1 ; eval "${testfailed}"; }
${kgetcred} --server ${service}@${R2} ||
{ ec=1 ; eval "${testfailed}"; }
${klist}
echo "checking that we go back right principal"
${klist} | grep "${service}@${R2}" > /dev/null || \
{ ec=1 ; eval "${testfailed}"; }
${kdestroy}
echo "killing kdc (${kdcpid})"
kill $kdcpid || exit 1

View File

@@ -11,17 +11,10 @@
TEST.H5L.SE = {
kdc = localhost:@port@
}
SUB.TEST.H5L.SE = {
kdc = localhost:@port@
}
TEST2.H5L.SE = {
kdc = localhost:@port@
}
[domain_realms]
.sub.test.h5l.se = SUB.TEST.H5L.SE
[kdc]
enable-digest = true
digests_allowed = chap-md5,digest-md5,ntlm-v1,ntlm-v1-session,ntlm-v2,ms-chap-v2