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

python:tests: Fix group_edit test with system libldb

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

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sun Jun 20 22:52:05 UTC 2021 on sn-devel-184
---

diff --git a/python/samba/tests/samba_tool/group_edit.sh b/python/samba/tests/samba_tool/group_edit.sh
index e8e4fecb2a9..4e8c6dffa2d 100755
--- a/python/samba/tests/samba_tool/group_edit.sh
+++ b/python/samba/tests/samba_tool/group_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
 
@@ -97,7 +102,7 @@ EOF
 }
 
 get_attribute_base64() {
-	${STpath}/bin/ldbsearch '(sAMAccountName=testgroup1)' displayName \
+	$samba_ldbsearch '(sAMAccountName=testgroup1)' displayName \
 		-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
 }