Skip to content
Snippets Groups Projects
Commit d572ba8a authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

fix ITS#4141 (better fix: split into 3 slapd; but it all makes little sense without threads...)

parent 1bfd1c7e
No related branches found
No related tags found
No related merge requests found
......@@ -51,11 +51,13 @@ AC_WITH_SASL=@WITH_SASL@
AC_WITH_TLS=@WITH_TLS@
AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
AC_ACI_ENABLED=aci@WITH_ACI_ENABLED@
AC_THREADS=threads@BUILD_THREAD@
export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql
export AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode
export AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort
export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED
export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql \
AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode \
AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort \
AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED \
AC_THREADS
if test ! -x ../servers/slapd/slapd ; then
echo "Could not locate slapd(8)"
......
......@@ -27,14 +27,15 @@ PPOLICY=${AC_ppolicy-ppolicyno}
REFINT=${AC_refint-refintno}
RETCODE=${AC_retcode-retcodeno}
RWM=${AC_rwm-rwmno}
SYNCPROV=${AC_syncprov-syncprovno}
TRANSLUCENT=${AC_translucent-translucentno}
UNIQUE=${AC_unique-uniqueno}
SYNCPROV=${AC_syncprov-syncprovno}
VALSORT=${AC_valsort-valsortno}
WITH_SASL=${AC_WITH_SASL-no}
USE_SASL=${SLAPD_USE_SASL-no}
WITHTLS=${AC_WITHTLS-yes}
ACI=${AC_ACI_ENABLED-acino}
VALSORT=${AC_valsort-valsortno}
THREADS=${AC_THREADS-threadsno}
PROGDIR=./progs
DATADIR=${USER_DATADIR-./testdata}
......
......@@ -16,7 +16,7 @@
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
echo "### This test requires the ldap backend."
echo "### This test requires the LDAP backend and the rwm overlay."
echo "### If available, and explicitly requested, it can use SASL bind;"
echo "### note that SASL must be properly set up, and the requested"
echo "### mechanism must be available. Define SLAPD_USE_SASL={yes|<mech>},"
......@@ -27,11 +27,16 @@ if test $BACKLDAP = "ldapno" ; then
exit 0
fi
if test $RWM = rwmno ; then
if test $RWM = "rwmno" ; then
echo "Rewrite/remap overlay not available, test skipped"
exit 0
fi
if test $THREADS = "threadsno" ; then
echo "Need threads support, test skipped"
exit 0
fi
if test $WITH_SASL = "yes" ; then
if test $USE_SASL != "no" ; then
if test $USE_SASL = "yes" ; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment