oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't do AFS string-to-key tests when feature is disabled

Browse Source
This commit is contained in:
Viktor Dukhovni
2017-03-09 16:15:42 -05:00
committed by Jeffrey Altman
parent 2baa0a00c8
commit 28b6b96e09
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/kdc/Makefile.am
View File

@@ -59,6 +59,7 @@ do_subst = $(heim_verbose)sed $(do_dlopen) \
-e 's,[@]objdir[@],$(top_builddir)/tests/kdc,g' \
-e 's,[@]top_builddir[@],$(top_builddir),g' \
-e 's,[@]db_type[@],$(db_type),g' \
-e 's,[@]ENABLE_AFS_STRING_TO_KEY[@],$(ENABLE_AFS_STRING_TO_KEY),' \
-e 's,[@]EGREP[@],$(EGREP),g'
chmod = chmod

14
tests/kdc/check-keys.in
View File

@@ -91,12 +91,14 @@ sed -e 's/@keys@/des:pw-salt:/' \
${sedvars} < ${CIN} > ${COUT}
${kadmin} cpw -p foo ${principal} || exit 1
sed -e 's/@keys@/des-cbc-crc:afs3-salt:test.h5l.se/' \
${sedvars} < ${CIN} > ${COUT}
${kadmin} cpw -p foo ${principal} || exit 1
if [ 'X@ENABLE_AFS_STRING_TO_KEY@' = "X1" ]; then
sed -e 's/@keys@/des-cbc-crc:afs3-salt:test.h5l.se/' \
${sedvars} < ${CIN} > ${COUT}
${kadmin} cpw -p foo ${principal} || exit 1
sed -e 's/@keys@/des:afs3-salt:test.h5l.se/' \
${sedvars} < ${CIN} > ${COUT}
${kadmin} cpw -p foo ${principal} || exit 1
sed -e 's/@keys@/des:afs3-salt:test.h5l.se/' \
${sedvars} < ${CIN} > ${COUT}
${kadmin} cpw -p foo ${principal} || exit 1
fi
exit 0