summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-08-22 23:48:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:32 -0500
commit8e36c42846352957a66745c267d3714831e2ab73 (patch)
treec627052628f889cc3f2cc607775971361798218e /source4
parent28e140972066d745cf74a84b4aa60276da2bd4b1 (diff)
downloadsamba-8e36c42846352957a66745c267d3714831e2ab73.tar.gz
samba-8e36c42846352957a66745c267d3714831e2ab73.tar.bz2
samba-8e36c42846352957a66745c267d3714831e2ab73.zip
r17726: not having slapd installed isn't a ldb test failure
(This used to be commit 33ccb93647a94fbbd2d08199b6655a3bf14d0a38)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/lib/ldb/tests/start_slapd.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/tests/start_slapd.sh b/source4/lib/ldb/tests/start_slapd.sh
index 49ce5538f1..f86555d3c9 100755
--- a/source4/lib/ldb/tests/start_slapd.sh
+++ b/source4/lib/ldb/tests/start_slapd.sh
@@ -7,6 +7,7 @@ fi
mkdir -p $LDBDIR/tests/tmp/db
-slapd -f $LDBDIR/tests/slapd.conf -h "`$LDBDIR/tests/ldapi_url.sh`" $*
+# not having slapd isn't considered a ldb test failure
+slapd -f $LDBDIR/tests/slapd.conf -h "`$LDBDIR/tests/ldapi_url.sh`" $* || exit 0
sleep 2