summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-30 12:07:18 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 04:46:06 +0200
commit00f5473de8e34fc7077ca48ca29d2fa5c8c1814e (patch)
tree007709f8275fc8c30f5806728274f42167b4e6d1
parentdf0cadbcc9c3706c8ef86dbc431795b31c1fce70 (diff)
downloadsamba-00f5473de8e34fc7077ca48ca29d2fa5c8c1814e.tar.gz
s4:selftest: change the blackbox.chgdcpass test to use a binary mapping for smbclient
-rwxr-xr-xsource4/selftest/tests.py2
-rwxr-xr-xtestprogs/blackbox/test_chgdcpass.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 23d5f203c61..40ef99cf513 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -318,7 +318,7 @@ plantestsuite("samba4.blackbox.masktest", "dc", [os.path.join(samba4srcdir, "tor
plantestsuite("samba4.blackbox.gentest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
plantestsuite("samba4.blackbox.wbinfo(dc:local)", "dc:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "dc"])
plantestsuite("samba4.blackbox.wbinfo(s4member:local)", "s4member:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', "s4member"])
-plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass'])
+plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass', smbclient])
plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "dc", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo'])
# Tests using the "Simple" NTVFS backend
diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh
index 66c1e57359d..37f9049eafe 100755
--- a/testprogs/blackbox/test_chgdcpass.sh
+++ b/testprogs/blackbox/test_chgdcpass.sh
@@ -5,7 +5,7 @@
if [ $# -lt 4 ]; then
cat <<EOF
-Usage: test_kinit.sh SERVER USERNAME REALM DOMAIN PREFIX
+Usage: test_kinit.sh SERVER USERNAME REALM DOMAIN PREFIX SMBCLIENT
EOF
exit 1;
fi
@@ -17,12 +17,12 @@ DOMAIN=$4
PREFIX=$5
ENCTYPE=$6
PROVDIR=$7
-shift 7
+smbclient=$8
+shift 8
failed=0
samba4bindir="$BINDIR"
samba4srcdir="$SRCDIR/source4"
-smbclient="$samba4bindir/smbclient"
samba4kinit="$samba4bindir/samba4kinit"
machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"