diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-18 10:37:32 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-02-18 12:45:41 +0100 |
| commit | e2b0d25b70e9a349f804311570b236e4404e8a9e (patch) | |
| tree | f045a1276b5a2ee436396cb79953e6412fbfe7d2 /testprogs | |
| parent | 97a62e22797fcab3a67b06e39dd6d6f524dd58da (diff) | |
| download | samba-e2b0d25b70e9a349f804311570b236e4404e8a9e.tar.gz samba-e2b0d25b70e9a349f804311570b236e4404e8a9e.tar.xz samba-e2b0d25b70e9a349f804311570b236e4404e8a9e.zip | |
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
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/upgradeprovision-oldrelease.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 } |