summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2022-12-22 14:03:29 +0100
committerAndreas Schneider <asn@cryptomilk.org>2022-12-23 14:35:31 +0000
commitc6cd1263275d5a48b98c2796e09f72909fb6455e (patch)
treeb7634e669487c4eb9c87bc76b768b15aa131aae3 /testprogs
parent535bc5dca7fdda0b00293f7670f320a6feb14247 (diff)
downloadsamba-c6cd1263275d5a48b98c2796e09f72909fb6455e.tar.gz
testprogs: Use system_or_builddir_binary() for test_old_enctypes
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/test_old_enctypes.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/testprogs/blackbox/test_old_enctypes.sh b/testprogs/blackbox/test_old_enctypes.sh
index 9119cb3f899..ef3de3948a0 100755
--- a/testprogs/blackbox/test_old_enctypes.sh
+++ b/testprogs/blackbox/test_old_enctypes.sh
@@ -20,19 +20,12 @@ samba4srcdir="$SRCDIR/source4"
samba_tool="$samba4bindir/samba-tool"
-ldbmodify="ldbmodify"
-if [ -x "$samba4bindir/ldbmodify" ]; then
- ldbmodify="$samba4bindir/ldbmodify"
-fi
-
-ldbsearch="ldbsearch"
-if [ -x "$samba4bindir/ldbsearch" ]; then
- ldbsearch="$samba4bindir/ldbsearch"
-fi
-
. $(dirname $0)/subunit.sh
. $(dirname $0)/common_test_fns.inc
+ldbmodify=$(system_or_builddir_binary ldbmodify "${BINDIR}")
+ldbsearch=$(system_or_builddir_binary ldbsearch "${BINDIR}")
+
out="${PREFIX_ABS}/tmpldbsearch.out"
$ldbsearch -H ldap://$SERVER -U$USERNAME%$PASSWORD -d0 sAMAccountName="$NETBIOSNAME\$" dn msDS-SupportedEncryptionTypes >$out
testit_grep "find my dn" msDS-SupportedEncryptionTypes cat $out || failed=$(expr $failed + 1)