From 28b6b96e0954e331b4424e5774b47466c288e5b6 Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni <viktor@twosigma.com>
Date: Thu, 9 Mar 2017 16:15:42 -0500
Subject: [PATCH] Don't do AFS string-to-key tests when feature is disabled

---
 configure.ac            |  2 ++
 tests/kdc/Makefile.am   |  1 +
 tests/kdc/check-keys.in | 14 ++++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index fdf733232..c60d35741 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,9 @@ AC_ARG_ENABLE(afs-string-to-key,
 
 if test "$enable_afs_string_to_key" = "yes"; then
 	AC_DEFINE(ENABLE_AFS_STRING_TO_KEY, 1, [Define if want to use the weak AFS string to key functions.])
+	ENABLE_AFS_STRING_TO_KEY=1
 fi
+AC_SUBST(ENABLE_AFS_STRING_TO_KEY)dnl
 
 
 rk_CHECK_MAN
diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index 49be118c1..e080527db 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -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
diff --git a/tests/kdc/check-keys.in b/tests/kdc/check-keys.in
index e96592b4f..e8aca2684 100644
--- a/tests/kdc/check-keys.in
+++ b/tests/kdc/check-keys.in
@@ -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