s4:selftets: change the blackbox.bogusdomain test to use binary mapping for smbclient

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index eb92038b5230809c70944ee7e90f93bec2b056b8..ba50a933993463aa50dbcc1dfe71301b578fca0f 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -361,7 +361,7 @@ for mech in [
     plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
                             ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
 
-plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD'])
+plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient])
 for mech in [
     "-k no",
     "-k no --option=usespnego=no",

diff --git a/testprogs/blackbox/bogus.sh b/testprogs/blackbox/bogus.sh
index 68bab03f9cdc58813ab12a6abd6a9c84373aa179..be67e1992e7a76d33d690f2db4021c9a435b53d4 100755 (executable)
--- a/testprogs/blackbox/bogus.sh
+++ b/testprogs/blackbox/bogus.sh
@@ -15,11 +15,11 @@ USER=$3
 PWD=$4
 DC_USER=$5
 DC_PWD=$6
-shift 6
+smbclient=$7
+shift 7
 
 TEST_USER=bogus_testuser
 TEST_PWD=bogus_pass3#@
-smbclient="$BINDIR/smbclient"
 net="$BINDIR/net"
 testit_expect_failure "smbclient" $smbclient "//$SERVER/$SHARE" -W POUET -U$DC_USER%$DC_PWD -c "dir"&& failed=`expr $failed + 1`
 testit "net.user.add" $net rpc user add $TEST_USER $TEST_PWD -W $SERVER -U$SERVER\\$USER%$PWD -S $SERVER