diff options
| -rwxr-xr-x | source4/lib/ldb/tests/init_slapd.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/tests/init_slapd.sh b/source4/lib/ldb/tests/init_slapd.sh index 8ebfed9c66..cf06acd08b 100755 --- a/source4/lib/ldb/tests/init_slapd.sh +++ b/source4/lib/ldb/tests/init_slapd.sh @@ -24,18 +24,18 @@ MODCONF=tests/tmp/modules.conf rm -f $MODCONF touch $MODCONF || exit 1 -if ! slaptest -u -f $LDBDIR/tests/slapd.conf > /dev/null 2>&1; then -echo "enabling sladp modules" -cat > $MODCONF <<EOF +slaptest -u -f $LDBDIR/tests/slapd.conf > /dev/null 2>&1 || { + echo "enabling sladp modules" +cat > $MODCONF <<EOF modulepath /usr/lib/ldap moduleload back_bdb EOF -fi +} -if ! slaptest -u -f $LDBDIR/tests/slapd.conf; then +slaptest -u -f $LDBDIR/tests/slapd.conf || { echo "slaptest failed - skipping ldap tests" exit 0 -fi +} slapadd -f $LDBDIR/tests/slapd.conf < $LDBDIR/tests/init.ldif || exit 0 |