sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s4:smbtorture: Fix samba3.smb.dir on btrfs

Browse Source 
"If a file is removed from or added to the directory after the most recent call
to opendir() or rewinddir(), whether a subsequent call to readdir() returns
an entry for that file is unspecified."
https://pubs.opengroup.org/onlinepubs/009604599/functions/readdir.html

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Nov 29 15:10:13 UTC 2024 on atb-devel-224
This commit is contained in:
Andreas Schneider 2024-11-29 07:37:54 +01:00 committed by Andreas Schneider
parent 38b8a4f223
commit fe96aa111c
1 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source4/torture/smb2/dir.c
View File

@ -53,6 +53,7 @@ static NTSTATUS populate_tree(struct torture_context *tctx,
struct smb2_handle *h_out)
{
struct smb2_create create;
struct smb2_handle dirh;
char **strs = NULL;
NTSTATUS status;
bool ret = true;
@ -72,7 +73,7 @@ static NTSTATUS populate_tree(struct torture_context *tctx,
status = smb2_create(tree, mem_ctx, &create);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "");
*h_out = create.out.file.handle;
dirh = create.out.file.handle;
ZERO_STRUCT(create);
create.in.desired_access = SEC_RIGHTS_FILE_ALL;
@ -93,6 +94,29 @@ static NTSTATUS populate_tree(struct torture_context *tctx,
files[i].create_time = create.out.create_time;
smb2_util_close(tree, create.out.file.handle);
}
/* Close the dir handle */
smb2_util_close(tree, dirh);
/*
* Reopen the directory handle that the readdir() in smbd will see the
* created files.
*/
ZERO_STRUCT(create);
create.in.desired_access = SEC_RIGHTS_DIR_ALL;
create.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
create.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY;
create.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
NTCREATEX_SHARE_ACCESS_WRITE |
NTCREATEX_SHARE_ACCESS_DELETE;
create.in.create_disposition = NTCREATEX_DISP_OPEN;
create.in.fname = DNAME;
status = smb2_create(tree, mem_ctx, &create);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "");
dirh = create.out.file.handle;
*h_out = dirh;
done:
if (!ret) {
return status;
@ -1204,6 +1228,16 @@ static bool test_file_index(struct torture_context *tctx,
smb2_util_close(tree, create.out.file.handle);
}
/* Close the dir handle */
smb2_util_close(tree, h);
/*
* Reopen the directory handle, that the readdir() in smbd will see the
* created files.
*/
status = torture_smb2_testdir(tree, DNAME, &h);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "");
ZERO_STRUCT(result);
result.tctx = tctx;
@ -1342,6 +1376,27 @@ static bool test_large_files(struct torture_context *tctx,
smb2_util_close(tree, create.out.file.handle);
}
/* Close dir handle */
smb2_util_close(tree, h);
/*
* Reopen the directory handle that the readdir() in smbd will see the
* created files.
*/
ZERO_STRUCT(create);
create.in.desired_access = SEC_RIGHTS_DIR_ALL;
create.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
create.in.file_attributes = FILE_ATTRIBUTE_DIRECTORY;
create.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
NTCREATEX_SHARE_ACCESS_WRITE |
NTCREATEX_SHARE_ACCESS_DELETE;
create.in.create_disposition = NTCREATEX_DISP_OPEN;
create.in.fname = DNAME;
status = smb2_create(tree, mem_ctx, &create);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done, "");
h = create.out.file.handle;
ZERO_STRUCT(f);
f.in.file.handle = h;
f.in.pattern = "*";