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>

diff --git a/testprogs/blackbox/test_old_enctypes.sh b/testprogs/blackbox/test_old_enctypes.sh
index 9119cb3f899f989ed54f0e62301707be0d32d729..ef3de3948a0f7cd4bc528e174131dae9033b2ec3 100755 (executable)
--- 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)