kdc: Make path to MIT Kerberos for testing configurable

This commit is contained in:
Nicolas Williams
2022-12-30 19:15:16 -06:00
parent 0f769dde17
commit 77a452f4fd
3 changed files with 9 additions and 8 deletions

View File

@@ -13,6 +13,7 @@ top_builddir="@top_builddir@"
top_srcdir="@top_srcdir@" top_srcdir="@top_srcdir@"
EGREP="@EGREP@" EGREP="@EGREP@"
NO_AFS="@NO_AFS@" NO_AFS="@NO_AFS@"
MITKRB5="@MITKRB5@"
# Meant to be sourced (source or .) by the tester application, offers # Meant to be sourced (source or .) by the tester application, offers
# most commands in heimdal as variables # most commands in heimdal as variables

View File

@@ -80,7 +80,9 @@ do_subst = $(heim_verbose)sed $(do_dlopen) \
-e 's,[@]db_type[@],$(db_type),g' \ -e 's,[@]db_type[@],$(db_type),g' \
-e 's,[@]max_life_from_cert[@],$(pkinit_ticket_max_life_from_cert),g' \ -e 's,[@]max_life_from_cert[@],$(pkinit_ticket_max_life_from_cert),g' \
-e 's,[@]ENABLE_AFS_STRING_TO_KEY[@],$(ENABLE_AFS_STRING_TO_KEY),' \ -e 's,[@]ENABLE_AFS_STRING_TO_KEY[@],$(ENABLE_AFS_STRING_TO_KEY),' \
-e 's,[@]EGREP[@],$(EGREP),g' -e 's,[@]ENABLE_AFS_STRING_TO_KEY[@],$(ENABLE_AFS_STRING_TO_KEY),' \
-e 's,[@]EGREP[@],$(EGREP),g' \
-e 's,[@]MITKRB5[@],$(MITKRB5),g'
chmod = chmod chmod = chmod

View File

@@ -171,9 +171,7 @@ done
# Use MIT client tools # Use MIT client tools
# #
mit=/usr/local/mitkerberos/bin if [ -n "$MITKRB5" -a -f "${MITKRB5}/kinit" ] ; then
if [ -f ${mit}/kinit ] ; then
echo "Running MIT FAST tests" echo "Running MIT FAST tests"
kinitpty=${objdir}/foopassword.rkpty kinitpty=${objdir}/foopassword.rkpty
@@ -183,25 +181,25 @@ password foo\n
EOF EOF
echo "Acquire host ticket"; > messages.log echo "Acquire host ticket"; > messages.log
${rkpty} ${kinitpty} ${mit}/kinit -c ${acache} ${server}@${R} >/dev/null|| { exit 1; } ${rkpty} ${kinitpty} "${MITKRB5}/kinit" -c ${acache} ${server}@${R} >/dev/null|| { exit 1; }
(${aklist} | grep ${server} > /dev/null ) || { exit 1; } (${aklist} | grep ${server} > /dev/null ) || { exit 1; }
echo "Checking for FAST avail"; > messages.log echo "Checking for FAST avail"; > messages.log
${aklist} --hidden | grep fast_avail > /dev/null || { exit 1; } ${aklist} --hidden | grep fast_avail > /dev/null || { exit 1; }
echo "Using plain to get a initial ticket"; > messages.log echo "Using plain to get a initial ticket"; > messages.log
${rkpty} ${kinitpty} ${mit}/kinit -c ${cache} foo@${R} >/dev/null|| { exit 1; } ${rkpty} ${kinitpty} "${MITKRB5}/kinit" -c ${cache} foo@${R} >/dev/null|| { exit 1; }
(${klist} | grep foo > /dev/null ) || { exit 1; } (${klist} | grep foo > /dev/null ) || { exit 1; }
echo "Using FAST to get a initial ticket"; > messages.log echo "Using FAST to get a initial ticket"; > messages.log
${rkpty} ${kinitpty} ${mit}/kinit -c ${cache} -T ${acache} foo@${R} >/dev/null || { exit 1; } ${rkpty} ${kinitpty} "${MITKRB5}/kinit" -c ${cache} -T ${acache} foo@${R} >/dev/null || { exit 1; }
(${klist} | grep foo > /dev/null ) || { exit 1; } (${klist} | grep foo > /dev/null ) || { exit 1; }
echo "Checking for FAST avail"; > messages.log echo "Checking for FAST avail"; > messages.log
${klist} --hidden | grep fast_avail > /dev/null || { exit 1; } ${klist} --hidden | grep fast_avail > /dev/null || { exit 1; }
echo "Getting service ticket"; > messages.log echo "Getting service ticket"; > messages.log
${mit}/kvno -c ${cache} ${server}@${R} || { exit 1; } "${MITKRB5}/kvno" -c ${cache} ${server}@${R} || { exit 1; }
fi fi