From: Andreas Schneider <asn@samba.org>
Date: Thu, 17 Jun 2021 12:57:41 +0000 (+0200)
Subject: python:tests: Fix contact_edit test with system libldb
X-Git-Tag: tevent-0.11.0~317
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f47ea8716f02fd4de44d3e0edbaeb26a9451f90d;p=thirdparty%2Fsamba.git

python:tests: Fix contact_edit test with system libldb

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/samba_tool/contact_edit.sh b/python/samba/tests/samba_tool/contact_edit.sh
index 038fbe2b4d7..05eac69c4e6 100755
--- a/python/samba/tests/samba_tool/contact_edit.sh
+++ b/python/samba/tests/samba_tool/contact_edit.sh
@@ -13,6 +13,11 @@ SERVER="$1"
 USERNAME="$2"
 PASSWORD="$3"
 
+samba_ldbsearch=ldbsearch
+if test -x $BINDIR/ldbsearch; then
+    samba_ldbsearch=$BINDIR/ldbsearch
+fi
+
 STpath=$(pwd)
 . $STpath/testprogs/blackbox/subunit.sh
 
@@ -51,7 +56,7 @@ EOF
 }
 
 get_attribute_base64() {
-	${STpath}/bin/ldbsearch '(&(objectClass=contact)(name=testcontact1))' \
+	$samba_ldbsearch '(&(objectClass=contact)(name=testcontact1))' \
 		displayName \
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }