Patch from Eray Asian to avoid PK-INIT when its not supported

This commit is contained in:
Love Hornquist Astrand
2010-06-03 14:16:48 -07:00
parent f73a7b94d0
commit abd5fdab5a
2 changed files with 23 additions and 3 deletions

View File

@@ -14,7 +14,8 @@ port = 49188
do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
-e 's,[@]port[@],$(port),g' \
-e 's,[@]objdir[@],$(top_builddir)/tests/can,g' \
-e 's,[@]EGREP[@],$(EGREP),g'
-e 's,[@]EGREP[@],$(EGREP),g' \
-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g'
test_can: test_can.in Makefile
$(do_subst) < $(srcdir)/test_can.in > test_can.tmp

View File

@@ -37,11 +37,30 @@
srcdir="@srcdir@"
objdir="@objdir@"
env_setup="@env_setup@"
. ${env_setup}
# If there is no useful db support compile in, disable test
../db/have-db || exit 77
${have_db} || exit 77
./test_can TEST.H5L.SE heim-0.8 || exit 1
./test_can TEST.H5L.SE apple-10.4 || exit 1
./test_can HEIMDAL.CITI.UMICH.EDU mit-pkinit-20070607 || exit 1
rsa=yes
pkinit=no
if ${hxtool} info | grep 'rsa: hx509 null RSA' > /dev/null ; then
rsa=no
fi
if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
rsa=no
fi
if ${kinit} --help 2>&1 | grep "CA certificates" > /dev/null; then
pkinit=yes
fi
if test "$pkinit" = yes -a "$rsa" = yes ; then
./test_can HEIMDAL.CITI.UMICH.EDU mit-pkinit-20070607 || exit 1
fi
exit 0