summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-05-12 16:56:29 +0200
committerAndreas Schneider <asn@cryptomilk.org>2014-09-01 15:47:33 +0200
commit7982c373b04377da7eb998f94846db5f9e56dbb7 (patch)
treed3a8d806bf47ae4f09eaf3a8e81dc913d92c39ba /testprogs
parent980ce21a5b80f4cd40f9c3876c09a885918491ce (diff)
downloadsamba-7982c373b04377da7eb998f94846db5f9e56dbb7.tar.gz
testprogs: Use the system binaries for KRB5 if we don't build in-tree heimdal.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org> Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/test_chgdcpass.sh7
-rwxr-xr-xtestprogs/blackbox/test_export_keytab.sh6
-rwxr-xr-xtestprogs/blackbox/test_kinit.sh12
-rwxr-xr-xtestprogs/blackbox/test_ktpass.sh6
-rwxr-xr-xtestprogs/blackbox/test_passwords.sh12
-rwxr-xr-xtestprogs/blackbox/test_pkinit.sh12
-rwxr-xr-xtestprogs/blackbox/test_samba_upgradedns.sh6
7 files changed, 51 insertions, 10 deletions
diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh
index d4734ea0286..35161251716 100755
--- a/testprogs/blackbox/test_chgdcpass.sh
+++ b/testprogs/blackbox/test_chgdcpass.sh
@@ -23,7 +23,12 @@ failed=0
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-samba4kinit="$samba4bindir/samba4kinit"
+
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=bin/samba4kinit
+fi
+
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"
diff --git a/testprogs/blackbox/test_export_keytab.sh b/testprogs/blackbox/test_export_keytab.sh
index a72c5484782..736c7af099f 100755
--- a/testprogs/blackbox/test_export_keytab.sh
+++ b/testprogs/blackbox/test_export_keytab.sh
@@ -20,10 +20,14 @@ shift 6
failed=0
samba4bindir="$BINDIR"
-samba4kinit="$samba4bindir/samba4kinit"
samba_tool="$samba4bindir/samba-tool"
newuser="$samba_tool user create"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
. `dirname $0`/subunit.sh
test_smbclient() {
diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh
index adfed782555..000303ac71f 100755
--- a/testprogs/blackbox/test_kinit.sh
+++ b/testprogs/blackbox/test_kinit.sh
@@ -23,10 +23,18 @@ failed=0
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-samba4kinit="$samba4bindir/samba4kinit"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
samba_tool="$samba4bindir/samba-tool"
rkpty="$samba4bindir/rkpty"
-samba4kpasswd="$samba4bindir/samba4kpasswd"
+samba4kpasswd=kpasswd
+if test -x $BINDIR/samba4kpasswd; then
+ samba4kpasswd=$BINDIR/samba4kpasswd
+fi
+
enableaccount="$samba_tool user enable"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"
diff --git a/testprogs/blackbox/test_ktpass.sh b/testprogs/blackbox/test_ktpass.sh
index f9672facabf..8a43eb31a0a 100755
--- a/testprogs/blackbox/test_ktpass.sh
+++ b/testprogs/blackbox/test_ktpass.sh
@@ -16,7 +16,11 @@ shift 1
samba_tool="$BINDIR/samba-tool"
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-samba4kinit="$samba4bindir/samba4kinit"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
CONFIG="--configfile=$PREFIX/dc/etc/smb.conf"
TESTUSER="ktpassUser"
diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh
index ab546a63084..4810177d127 100755
--- a/testprogs/blackbox/test_passwords.sh
+++ b/testprogs/blackbox/test_passwords.sh
@@ -21,11 +21,19 @@ shift 7
failed=0
samba4bindir="$BINDIR"
-samba4kinit="$samba4bindir/samba4kinit"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
samba_tool="$samba4bindir/samba-tool"
smbpasswd="$samba4bindir/smbpasswd"
rkpty="$samba4bindir/rkpty"
-samba4kpasswd="$samba4bindir/samba4kpasswd"
+samba4kpasswd=kpasswd
+if test -x $BINDIR/samba4kpasswd; then
+ samba4kpasswd=$BINDIR/samba4kpasswd
+fi
+
newuser="$samba_tool user create"
. `dirname $0`/subunit.sh
diff --git a/testprogs/blackbox/test_pkinit.sh b/testprogs/blackbox/test_pkinit.sh
index 8fab26158b4..78c888bb6c3 100755
--- a/testprogs/blackbox/test_pkinit.sh
+++ b/testprogs/blackbox/test_pkinit.sh
@@ -23,10 +23,18 @@ failed=0
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-samba4kinit="$samba4bindir/samba4kinit"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
samba_tool="$samba4bindir/samba-tool"
rkpty="$samba4bindir/rkpty"
-samba4kpasswd="$samba4bindir/samba4kpasswd"
+samba4kpasswd=kpasswd
+if test -x $BINDIR/samba4kpasswd; then
+ samba4passwd=$BINDIR/samba4kpasswd
+fi
+
enableaccount="$samba_tool user enable"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"
diff --git a/testprogs/blackbox/test_samba_upgradedns.sh b/testprogs/blackbox/test_samba_upgradedns.sh
index a080f735ea4..cd5b833b21b 100755
--- a/testprogs/blackbox/test_samba_upgradedns.sh
+++ b/testprogs/blackbox/test_samba_upgradedns.sh
@@ -19,7 +19,11 @@ failed=0
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-samba4kinit="$samba4bindir/samba4kinit"
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+ samba4kinit=$BINDIR/samba4kinit
+fi
+
. `dirname $0`/subunit.sh