]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
nsswitch:tests: Use ldb(modify|search) from the system
authorAndreas Schneider <asn@samba.org>
Thu, 1 Dec 2022 14:49:43 +0000 (15:49 +0100)
committerVolker Lendecke <vl@samba.org>
Mon, 5 Dec 2022 09:36:40 +0000 (09:36 +0000)
If Samba is built against the system libldb, use the system tools.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Dec  5 09:36:40 UTC 2022 on sn-devel-184

nsswitch/tests/test_idmap_ad.sh

index 323aa1728d0c7741da3c899a0f533993d15ff8ae..aef74bead96bfdd33c2a6a7729d4b4a998377d87 100755 (executable)
@@ -16,8 +16,15 @@ TRUST_SERVER="$5"
 TRUST_PASSWORD="$6"
 
 wbinfo="$VALGRIND $BINDIR/wbinfo"
-ldbmodify="$VALGRIND $BINDIR/ldbmodify"
-ldbsearch="$VALGRIND $BINDIR/ldbsearch"
+ldbmodify="${VALGRIND} ldbmodify"
+if [ -x "${BINDIR}/ldbmodify" ]; then
+       ldbmodify="${VALGRIND} ${BINDIR}/ldbmodify"
+fi
+
+ldbsearch="${VALGRIND} ldbsearch"
+if [ -x "${BINDIR}/ldbsearch" ]; then
+       ldbsearch="${VALGRIND} ${BINDIR}/ldbsearch"
+fi
 
 failed=0