diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 12:16:49 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | e7281b450a5d77b783f0d840d1097593b57f781f (patch) | |
| tree | 258777708f22e7d3ab043ee092f95ba4e20d669b | |
| parent | d86ae30bb8cce9fb78b655a05f3eaba4fc6a0bb8 (diff) | |
| download | samba-e7281b450a5d77b783f0d840d1097593b57f781f.tar.gz samba-e7281b450a5d77b783f0d840d1097593b57f781f.tar.bz2 samba-e7281b450a5d77b783f0d840d1097593b57f781f.zip | |
s4:selftest: change the blackbox.pkinit test to use a binary mapping for smbclient
| -rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_pkinit.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 5ae14a3710..61d8724641 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -304,7 +304,7 @@ planpythontestsuite("dc", "samba.tests.dns") planpythontestsuite("none", "samba.tests.blackbox.ndrdump") planpythontestsuite("none", "samba.tests.source") plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient]) -plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration]) +plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration]) plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration]) plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", smbclient, configuration]) plantestsuite("samba4.blackbox.kinit(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient, configuration]) diff --git a/testprogs/blackbox/test_pkinit.sh b/testprogs/blackbox/test_pkinit.sh index f5caccd390..926545aa9d 100755 --- a/testprogs/blackbox/test_pkinit.sh +++ b/testprogs/blackbox/test_pkinit.sh @@ -5,7 +5,7 @@ if [ $# -lt 5 ]; then cat <<EOF -Usage: test_kinit.sh SERVER USERNAME PASSWORD REALM DOMAIN PREFIX +Usage: test_kinit.sh SERVER USERNAME PASSWORD REALM DOMAIN PREFIX ENCTYPE SMBCLINET EOF exit 1; fi @@ -17,12 +17,12 @@ REALM=$4 DOMAIN=$5 PREFIX=$6 ENCTYPE=$7 -shift 7 +smbclient=$8 +shift 8 failed=0 samba4bindir="$BINDIR" samba4srcdir="$SRCDIR/source4" -smbclient="$samba4bindir/smbclient" samba4kinit="$samba4bindir/samba4kinit" samba_tool="$samba4bindir/samba-tool" ldbmodify="$samba4bindir/ldbmodify" |