From 140d1f6e9bac03448971b624b78d05f6f67ad93d Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 19 Jun 2004 10:36:03 +0000
Subject: [PATCH] improve SASL detection/usage in test

---
 tests/scripts/conf.sh          | 1 -
 tests/scripts/defines.sh       | 1 +
 tests/scripts/test028-idassert | 7 ++++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 510c461d40..99147ad9bb 100755
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -22,7 +22,6 @@ if [ x"$MONITORDB" = x"yes" -o x"$MONITORDB" = xmod ] ; then
 else
 	MON=nomonitor
 fi
-USE_SASL=${SLAPD_USE_SASL+yes}
 if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" = x"yes" ] ; then
 	SASL="sasl"
 else
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 7113ea8bf3..443d3304f3 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -20,6 +20,7 @@ PPOLICY=${AC_ppolicy-ppolicyno}
 REFINT=${AC_refint-refintno}
 UNIQUE=${AC_unique-uniqueno}
 WITH_SASL=${AC_WITH_SASL-no}
+USE_SASL=${SLAPD_USE_SASL-no}
 WITHTLS=${AC_WITHTLS-yes}
 
 DATADIR=./testdata
diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index d03d4dfcd2..79815d6030 100755
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -22,7 +22,12 @@ if test $BACKLDAP = "ldapno" ; then
 fi 
 
 if test $WITH_SASL = "yes" ; then
-	echo "Using SASL authc/authz..."
+	if test $USE_SASL = "yes" ; then
+		echo "Using SASL authc/authz..."
+	else
+		echo "Using proxyAuthz with simple authc"
+		echo "set SLAPD_USE_SASL=yes to enable SASL authc/authz..."
+	fi
 else
 	echo "SASL not available; using proxyAuthz with simple authc..."
 fi
-- 
2.39.5