summaryrefslogtreecommitdiff
path: root/python/samba/tests/samba_tool
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2021-06-17 14:57:41 +0200
committerAndrew Bartlett <abartlet@samba.org>2021-06-20 22:06:36 +0000
commitf47ea8716f02fd4de44d3e0edbaeb26a9451f90d (patch)
tree2651fd8ce6082a7da33f4ad68e8770105a35005f /python/samba/tests/samba_tool
parenta45ea91cd7e8335319c96ea5bda02014f584df63 (diff)
downloadsamba-f47ea8716f02fd4de44d3e0edbaeb26a9451f90d.tar.gz
samba-f47ea8716f02fd4de44d3e0edbaeb26a9451f90d.tar.bz2
samba-f47ea8716f02fd4de44d3e0edbaeb26a9451f90d.zip
python:tests: Fix contact_edit test with system libldb
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/tests/samba_tool')
-rwxr-xr-xpython/samba/tests/samba_tool/contact_edit.sh7
1 files changed, 6 insertions, 1 deletions
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"
}