sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4:torture: Use C99 initializers for level in smb2 dir test

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andreas Schneider 2018-12-13 13:40:19 +01:00 committed by Andreas Schneider
parent a5362457af
commit 660428a2e3
1 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,35 +312,59 @@ static struct {
NTSTATUS status;
union smb_search_data data;
} levels[] = {
{"SMB2_FIND_DIRECTORY_INFO",
SMB2_FIND_DIRECTORY_INFO, RAW_SEARCH_DATA_DIRECTORY_INFO,
offsetof(union smb_search_data, directory_info.name.s),
offsetof(union smb_search_data, directory_info.file_index),
{
.name = "SMB2_FIND_DIRECTORY_INFO",
.level = SMB2_FIND_DIRECTORY_INFO,
.data_level = RAW_SEARCH_DATA_DIRECTORY_INFO,
.name_offset = offsetof(union smb_search_data,
directory_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
directory_info.file_index),
},
{"SMB2_FIND_FULL_DIRECTORY_INFO",
SMB2_FIND_FULL_DIRECTORY_INFO, RAW_SEARCH_DATA_FULL_DIRECTORY_INFO,
offsetof(union smb_search_data, full_directory_info.name.s),
offsetof(union smb_search_data, full_directory_info.file_index),
{
.name = "SMB2_FIND_FULL_DIRECTORY_INFO",
.level = SMB2_FIND_FULL_DIRECTORY_INFO,
.data_level = RAW_SEARCH_DATA_FULL_DIRECTORY_INFO,
.name_offset = offsetof(union smb_search_data,
full_directory_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
full_directory_info.file_index),
},
{"SMB2_FIND_NAME_INFO",
SMB2_FIND_NAME_INFO, RAW_SEARCH_DATA_NAME_INFO,
offsetof(union smb_search_data, name_info.name.s),
offsetof(union smb_search_data, name_info.file_index),
{
.name = "SMB2_FIND_NAME_INFO",
.level = SMB2_FIND_NAME_INFO,
.data_level = RAW_SEARCH_DATA_NAME_INFO,
.name_offset = offsetof(union smb_search_data,
name_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
name_info.file_index),
},
{"SMB2_FIND_BOTH_DIRECTORY_INFO",
SMB2_FIND_BOTH_DIRECTORY_INFO, RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
offsetof(union smb_search_data, both_directory_info.name.s),
offsetof(union smb_search_data, both_directory_info.file_index),
{
.name = "SMB2_FIND_BOTH_DIRECTORY_INFO",
.level = SMB2_FIND_BOTH_DIRECTORY_INFO,
.data_level = RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
.name_offset = offsetof(union smb_search_data,
both_directory_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
both_directory_info.file_index),
},
{"SMB2_FIND_ID_FULL_DIRECTORY_INFO",
SMB2_FIND_ID_FULL_DIRECTORY_INFO, RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO,
offsetof(union smb_search_data, id_full_directory_info.name.s),
offsetof(union smb_search_data, id_full_directory_info.file_index),
{
.name = "SMB2_FIND_ID_FULL_DIRECTORY_INFO",
.level = SMB2_FIND_ID_FULL_DIRECTORY_INFO,
.data_level = RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO,
.name_offset = offsetof(union smb_search_data,
id_full_directory_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
id_full_directory_info.file_index),
},
{"SMB2_FIND_ID_BOTH_DIRECTORY_INFO",
SMB2_FIND_ID_BOTH_DIRECTORY_INFO, RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO,
offsetof(union smb_search_data, id_both_directory_info.name.s),
offsetof(union smb_search_data, id_both_directory_info.file_index),
{
.name = "SMB2_FIND_ID_BOTH_DIRECTORY_INFO",
.level = SMB2_FIND_ID_BOTH_DIRECTORY_INFO,
.data_level = RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO,
.name_offset = offsetof(union smb_search_data,
id_both_directory_info.name.s),
.resume_key_offset = offsetof(union smb_search_data,
id_both_directory_info.file_index),
}
};