diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 12:18:35 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:06 +0200 |
| commit | 72fbbdb9b35fe2f6da09512fe9d887c7a8211739 (patch) | |
| tree | 6505681f1887eb566fe195525e136852371f726c | |
| parent | e7281b450a5d77b783f0d840d1097593b57f781f (diff) | |
| download | samba-72fbbdb9b35fe2f6da09512fe9d887c7a8211739.tar.gz samba-72fbbdb9b35fe2f6da09512fe9d887c7a8211739.tar.bz2 samba-72fbbdb9b35fe2f6da09512fe9d887c7a8211739.zip | |
s4:selftest: change the blackbox.passwords test to use a binary mapping for smbclient
| -rwxr-xr-x | source4/selftest/tests.py | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_passwords.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 61d8724641..ac68fb0562 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -309,7 +309,7 @@ plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir 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]) 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.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX", smbclient]) 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]) diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh index 822f0fbee6..bc3447b1b5 100755 --- a/testprogs/blackbox/test_passwords.sh +++ b/testprogs/blackbox/test_passwords.sh @@ -5,7 +5,7 @@ if [ $# -lt 5 ]; then cat <<EOF -Usage: test_passwords.sh SERVER USERNAME PASSWORD REALM DOMAIN PREFIX +Usage: test_passwords.sh SERVER USERNAME PASSWORD REALM DOMAIN PREFIX SMBCLIENT EOF exit 1; fi @@ -16,11 +16,11 @@ PASSWORD=$3 REALM=$4 DOMAIN=$5 PREFIX=$6 -shift 6 +smbclient=$7 +shift 7 failed=0 samba4bindir="$BINDIR" -smbclient="$samba4bindir/smbclient" samba4kinit="$samba4bindir/samba4kinit" samba_tool="$samba4bindir/samba-tool" smbpasswd="$samba4bindir/smbpasswd" |