diff options
| -rwxr-xr-x | selftest/target/Samba3.pm | 7 | ||||
| -rwxr-xr-x | source3/script/tests/test_smbclient_machine_auth.sh | 4 | ||||
| -rwxr-xr-x | source3/script/tests/test_smbclient_s3.sh | 8 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 5 |
4 files changed, 22 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index adca52fdfa..8546bd2895 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -963,6 +963,13 @@ sub provision($$$$$$) [ro-tmp] path = $ro_shrdir guest ok = yes +[write-list-tmp] + path = $shrdir + read only = yes + write list = $unix_name +[valid-users-tmp] + path = $shrdir + valid users = $unix_name [msdfs-share] path = $msdfs_shrdir msdfs root = yes diff --git a/source3/script/tests/test_smbclient_machine_auth.sh b/source3/script/tests/test_smbclient_machine_auth.sh index f67256d19b..a890d48314 100755 --- a/source3/script/tests/test_smbclient_machine_auth.sh +++ b/source3/script/tests/test_smbclient_machine_auth.sh @@ -19,3 +19,7 @@ incdir=`dirname $0`/../../../testprogs/blackbox . $incdir/subunit.sh testit "smbclient //$SERVER/tmp" $SMBCLIENT //$SERVER/tmp --machine-pass -I $SERVER_IP -p 139 -c quit $ADDARGS + +# Testing these here helps because we know the machine account isn't already this user/group +testit "smbclient //$SERVER/forceuser" $SMBCLIENT //$SERVER/tmp --machine-pass -I $SERVER_IP -p 139 -c quit $ADDARGS +testit "smbclient //$SERVER/forcegroup" $SMBCLIENT //$SERVER/tmp --machine-pass -I $SERVER_IP -p 139 -c quit $ADDARGS diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index fb518c58c7..b240da0769 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -212,7 +212,7 @@ mkdir a_test_dir quit EOF - cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT "$@" -U% //$SERVER/ro-tmp -I $SERVER_IP $ADDARGS < $tmpfile 2>&1' + cmd='CLI_FORCE_INTERACTIVE=yes $SMBCLIENT -U% //$SERVER/$1" -I $SERVER_IP $ADDARGS < $tmpfile 2>&1' eval echo "$cmd" out=`eval $cmd` ret=$? @@ -581,7 +581,11 @@ testit "creating a good symlink and deleting it by path" \ failed=`expr $failed + 1` testit "writing into a read-only directory fails" \ - test_read_only_dir || \ + test_read_only_dir ro-tmp || \ + failed=`expr $failed + 1` + +testit "writing into a read-only share fails" \ + test_read_only_dir valid-users-tmp || \ failed=`expr $failed + 1` testit "Reading a owner-only file fails" \ diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 57a67ede42..44efe1836f 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -333,6 +333,11 @@ for t in tests: elif t == "smb2.durable-open" or t == "smb2.durable-v2-open": plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD') + elif t == "base.rw1": + plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/valid-users-tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/write-list-tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') else: plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') |