]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
python:tests: Fix contact_edit test with system libldb
authorAndreas Schneider <asn@samba.org>
Thu, 17 Jun 2021 12:57:41 +0000 (14:57 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 20 Jun 2021 22:06:36 +0000 (22:06 +0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/samba_tool/contact_edit.sh

index 038fbe2b4d718b0c159d2e2a8908d85b42751ad7..05eac69c4e623adaafff26de335a91628415cd7e 100755 (executable)
@@ -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"
 }