From: Ralph Boehme Date: Fri, 23 Oct 2020 14:25:06 +0000 (+0200) Subject: smbd: add and use SMB2_FILE_ALL_INFORMATION X-Git-Tag: talloc-2.3.2~120 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dad9a31cb70a45e2c5afc4c9c4885cab008b4d6;p=thirdparty%2Fsamba.git smbd: add and use SMB2_FILE_ALL_INFORMATION Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 23 19:06:40 UTC 2020 on sn-devel-184 --- diff --git a/source3/include/trans2.h b/source3/include/trans2.h index 0ed3b85c1d5..637ed303e51 100644 --- a/source3/include/trans2.h +++ b/source3/include/trans2.h @@ -407,6 +407,7 @@ Byte offset Type name description /* Internal mapped versions. */ #define SMB2_FILE_RENAME_INFORMATION_INTERNAL (FSCC_FILE_RENAME_INFORMATION + SMB2_INFO_SPECIAL) #define SMB2_FILE_FULL_EA_INFORMATION (FSCC_FILE_FULL_EA_INFORMATION + SMB2_INFO_SPECIAL) +#define SMB2_FILE_ALL_INFORMATION (FSCC_FILE_ALL_INFORMATION + SMB2_INFO_SPECIAL) /* NT passthough levels for qfsinfo. */ diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c index 5a9578c1c1e..d673709fc67 100644 --- a/source3/smbd/smb2_getinfo.c +++ b/source3/smbd/smb2_getinfo.c @@ -308,8 +308,8 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx, file_info_level = SMB2_FILE_FULL_EA_INFORMATION; break; - case 0x12:/* RAW_FILEINFO_SMB2_ALL_INFORMATION */ - file_info_level = 0xFF00 | in_file_info_class; + case FSCC_FILE_ALL_INFORMATION: + file_info_level = SMB2_FILE_ALL_INFORMATION; break; default: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index ae1ceaeefd0..bf06175227b 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5655,7 +5655,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, break; } - case 0xFF12:/*SMB2_FILE_ALL_INFORMATION*/ + case SMB2_FILE_ALL_INFORMATION: { unsigned int ea_size = estimate_ea_size(conn, fsp, smb_fname);