diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 12:09:25 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | 104135faa9d0c7926ceea2f3fc1152312414f210 (patch) | |
| tree | 1687d39484ad5d8f832ad810a74be1eac0122b83 | |
| parent | 00f5473de8e34fc7077ca48ca29d2fa5c8c1814e (diff) | |
| download | samba-104135faa9d0c7926ceea2f3fc1152312414f210.tar.gz samba-104135faa9d0c7926ceea2f3fc1152312414f210.tar.bz2 samba-104135faa9d0c7926ceea2f3fc1152312414f210.zip | |
s4:selftest: change the blackbox.export.keytab test to use a binary mapping for smbclient
| -rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_export_keytab.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 40ef99cf51..9a4c851695 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -310,7 +310,7 @@ plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.pat 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", configuration]) plantestsuite("samba4.blackbox.ktpass(dc)", "dc", [os.path.join(bbdir, "test_ktpass.sh"), '$PREFIX']) plantestsuite("samba4.blackbox.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX"]) -plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX"]) +plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient]) plantestsuite("samba4.blackbox.cifsdd(dc)", "dc", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"]) plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP', nmblookup]) plantestsuite("samba4.blackbox.locktest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX']) diff --git a/testprogs/blackbox/test_export_keytab.sh b/testprogs/blackbox/test_export_keytab.sh index 14122bfe71..a72c548478 100755 --- a/testprogs/blackbox/test_export_keytab.sh +++ b/testprogs/blackbox/test_export_keytab.sh @@ -5,7 +5,7 @@ if [ $# -lt 5 ]; then cat <<EOF -Usage: test_extract_keytab.sh SERVER USERNAME REALM DOMAIN PREFIX +Usage: test_extract_keytab.sh SERVER USERNAME REALM DOMAIN PREFIX SMBCLIENT EOF exit 1; fi @@ -15,11 +15,11 @@ USERNAME=$2 REALM=$3 DOMAIN=$4 PREFIX=$5 -shift 5 +smbclient=$6 +shift 6 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient" samba4kinit="$samba4bindir/samba4kinit" samba_tool="$samba4bindir/samba-tool" newuser="$samba_tool user create" |