testprogs: Use system binary if we did not build ldbdel.
authorAndreas Schneider <asn@samba.org>
Tue, 18 Feb 2014 09:37:32 +0000 (10:37 +0100)
committerVolker Lendecke <vl@samba.org>
Tue, 18 Feb 2014 11:45:41 +0000 (12:45 +0100)
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

testprogs/blackbox/upgradeprovision-oldrelease.sh

index d12c2cf172d1800f30be987ebae615d9060bcdeb..3cb792933414d25ade2283f20254bbf2d7cf6743 100755 (executable)
@@ -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
 }