From: Andreas Schneider <asn@samba.org>
Date: Tue, 18 Feb 2014 09:37:32 +0000 (+0100)
Subject: testprogs: Use system binary if we did not build ldbdel.
X-Git-Tag: tdb-1.2.13~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b0d25b70e9a349f804311570b236e4404e8a9e;p=thirdparty%2Fsamba.git

testprogs: Use system binary if we did not build ldbdel.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Tue Feb 18 12:45:41 CET 2014 on sn-devel-104
---

diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh
index d12c2cf172d..3cb79293341 100755
--- a/testprogs/blackbox/upgradeprovision-oldrelease.sh
+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh
@@ -15,6 +15,11 @@ shift 2
 
 release_dir=`dirname $0`/../../source4/selftest/provisions/${RELEASE}
 
+LDBDEL_BIN=ldbdel
+if [ -x "$BINDIR/ldbdel" ]; then
+	LDBDEL_BIN=$BINDIR/ldbdel
+fi
+
 undump() {
        if test -x $BINDIR/tdbrestore;
        then
@@ -42,7 +47,7 @@ undump() {
 remove_dns_user() {
     if [ x$RELEASE != x"release-4-0-0" ]; then
        # This is done, because otherwise the upgrdeprovision will not run without --full
-	$BINDIR/ldbdel -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp
+       ${LDBDEL_BIN} -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp
     fi
 }