From e9c3318e52ca41a3f40a9fe8803f882e4142a2db Mon Sep 17 00:00:00 2001 From: Aravind Srinivasan Date: Tue, 6 Oct 2009 16:57:34 -0700 Subject: s4/torture: Add SMB sharemode/access mask tests Test several thousand permutations of create mask and sharemodes on file and directory opens. These tests use a checked-in results table derived from a WinXP server to verify correct server behavior. CREATEX_ACCESS CREATEX_SHAREMODES_FILE CREATEX_SHAREMODES_DIR MAXIMUM_ALLOWED --- source4/torture/basic/base.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/torture/basic/base.c') diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 549db63b34..892ca30bc1 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -1767,6 +1767,10 @@ NTSTATUS torture_base_init(void) torture_suite_add_suite(suite, torture_trans2_aliases(suite)); torture_suite_add_1smb_test(suite, "TRANS2-SCAN", torture_trans2_scan); torture_suite_add_1smb_test(suite, "NTTRANS", torture_nttrans_scan); + torture_suite_add_1smb_test(suite, "CREATEX_ACCESS", torture_createx_access); + torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_FILE", torture_createx_sharemodes_file); + torture_suite_add_2smb_test(suite, "CREATEX_SHAREMODES_DIR", torture_createx_sharemodes_dir); + torture_suite_add_1smb_test(suite, "MAXIMUM_ALLOWED", torture_maximum_allowed); torture_suite_add_simple_test(suite, "BENCH-HOLDCON", torture_holdcon); torture_suite_add_simple_test(suite, "BENCH-READWRITE", run_benchrw); -- cgit From 3c028ff88b7f8b4a19a058ee44aeb42c10f4b398 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Oct 2009 18:26:19 +1100 Subject: s4-smb: declare root_fid as a file handle In order to implement root_fid in the s4 SMB server we need to declare it as a handle type, just as for other fnum values in SMB. This required some extensive (but simple) changes in many bits of code. --- source4/torture/basic/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/torture/basic/base.c') diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 892ca30bc1..355c569bb3 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -1493,7 +1493,7 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx) io.generic.level = RAW_OPEN_NTCREATEX; io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; io.ntcreatex.in.alloc_size = 1024*1024; io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY; @@ -1627,7 +1627,7 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx) smbcli_close(cli_nt->tree, fnum); io.generic.level = RAW_OPEN_NTCREATEX; - io.ntcreatex.in.root_fid = 0; + io.ntcreatex.in.root_fid.fnum = 0; io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL; io.ntcreatex.in.alloc_size = 0; io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_DIRECTORY; -- cgit