sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

smbtorture: prepare test_overwrite_read_only_file() for more subtests

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15732

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2024-10-02 14:07:49 +02:00
parent 1428519372
commit f88e52a6f4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source4/torture/smb2/acls.c
View File

@ -2993,7 +2993,7 @@ static bool test_overwrite_read_only_file(struct torture_context *tctx,
struct smb2_tree *tree) struct smb2_tree *tree)
{ {
NTSTATUS status; NTSTATUS status;
struct smb2_create c; struct smb2_create c = {};
const char *fname = BASEDIR "\\test_overwrite_read_only_file.txt"; const char *fname = BASEDIR "\\test_overwrite_read_only_file.txt";
struct smb2_handle handle = {{0}}; struct smb2_handle handle = {{0}};
union smb_fileinfo q; union smb_fileinfo q;
@ -3007,12 +3007,15 @@ static bool test_overwrite_read_only_file(struct torture_context *tctx,
int disposition; int disposition;
const char *disposition_string; const char *disposition_string;
NTSTATUS expected_status; NTSTATUS expected_status;
} tcases[] = { };
#define TCASE(d, s) { \ #define TCASE(d, s) { \
.disposition = d, \ .disposition = d, \
.disposition_string = #d, \ .disposition_string = #d, \
.expected_status = s, \ .expected_status = s, \
} }
struct tcase fs_tcases[] = {
TCASE(NTCREATEX_DISP_OPEN, NT_STATUS_OK), TCASE(NTCREATEX_DISP_OPEN, NT_STATUS_OK),
TCASE(NTCREATEX_DISP_SUPERSEDE, NT_STATUS_ACCESS_DENIED), TCASE(NTCREATEX_DISP_SUPERSEDE, NT_STATUS_ACCESS_DENIED),
TCASE(NTCREATEX_DISP_OVERWRITE, NT_STATUS_ACCESS_DENIED), TCASE(NTCREATEX_DISP_OVERWRITE, NT_STATUS_ACCESS_DENIED),
@ -3075,12 +3078,12 @@ static bool test_overwrite_read_only_file(struct torture_context *tctx,
smb2_util_close(tree, handle); smb2_util_close(tree, handle);
ZERO_STRUCT(handle); ZERO_STRUCT(handle);
for (i = 0; i < ARRAY_SIZE(tcases); i++) { for (i = 0; i < ARRAY_SIZE(fs_tcases); i++) {
torture_comment(tctx, "Verify open with %s disposition\n", torture_comment(tctx, "Verify open with %s disposition\n",
tcases[i].disposition_string); fs_tcases[i].disposition_string);
c = (struct smb2_create) { c = (struct smb2_create) {
.in.create_disposition = tcases[i].disposition, .in.create_disposition = fs_tcases[i].disposition,
.in.desired_access = SEC_FILE_READ_DATA, .in.desired_access = SEC_FILE_READ_DATA,
.in.file_attributes = FILE_ATTRIBUTE_NORMAL, .in.file_attributes = FILE_ATTRIBUTE_NORMAL,
.in.share_access = NTCREATEX_SHARE_ACCESS_MASK, .in.share_access = NTCREATEX_SHARE_ACCESS_MASK,
@ -3091,7 +3094,7 @@ static bool test_overwrite_read_only_file(struct torture_context *tctx,
status = smb2_create(tree, tctx, &c); status = smb2_create(tree, tctx, &c);
smb2_util_close(tree, c.out.file.handle); smb2_util_close(tree, c.out.file.handle);
torture_assert_ntstatus_equal_goto( torture_assert_ntstatus_equal_goto(
tctx, status, tcases[i].expected_status, ret, done, tctx, status, fs_tcases[i].expected_status, ret, done,
"smb2_create failed\n"); "smb2_create failed\n");
}; };