testprogs: Fix pkinit test with system ldb.
authorAndreas Schneider <asn@samba.org>
Fri, 21 Feb 2014 14:55:22 +0000 (15:55 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Fri, 21 Feb 2014 16:58:24 +0000 (17:58 +0100)
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Feb 21 17:58:24 CET 2014 on sn-devel-104

testprogs/blackbox/test_pkinit.sh

index 926545aa9d503c83443ab0ca46add505d8e1621b..8fab26158b436b6fcc3ce80e8e1a31d83df12ecc 100755 (executable)
@@ -25,13 +25,21 @@ samba4bindir="$BINDIR"
 samba4srcdir="$SRCDIR/source4"
 samba4kinit="$samba4bindir/samba4kinit"
 samba_tool="$samba4bindir/samba-tool"
-ldbmodify="$samba4bindir/ldbmodify"
-ldbsearch="$samba4bindir/ldbsearch"
 rkpty="$samba4bindir/rkpty"
 samba4kpasswd="$samba4bindir/samba4kpasswd"
 enableaccount="$samba_tool user enable"
 machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"
 
+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
 
 test_smbclient() {