smbd: add and use SMB2_FILE_FULL_EA_INFORMATION

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index 16e50b59b7de0a986fc19f3908be9fffb15e79b1..0ed3b85c1d5198c8a2cc161a625b6a2a244de4b9 100644 (file)
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -406,6 +406,7 @@ Byte offset   Type     name                description
 #define SMB_FILE_MAXIMUM_INFORMATION                   (FSCC_FILE_MAXIMUM_INFORMATION + NT_PASSTHROUGH_OFFSET)
 /* 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)
 
 /* NT passthough levels for qfsinfo. */
 

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index f4fb7ce0b231f660ca8e0c774de642858692f803..5a9578c1c1eb23884121f9bca65c4c7b4192c880 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -304,8 +304,8 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                ZERO_STRUCT(write_time_ts);
 
                switch (in_file_info_class) {
-               case 0x0F:/* RAW_FILEINFO_SMB2_ALL_EAS */
-                       file_info_level = 0xFF00 | in_file_info_class;
+               case FSCC_FILE_FULL_EA_INFORMATION:
+                       file_info_level = SMB2_FILE_FULL_EA_INFORMATION;
                        break;
 
                case 0x12:/* RAW_FILEINFO_SMB2_ALL_INFORMATION */

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ab1ada8e356c2e68471c3845b97cbaa6caf1cd4e..ae1ceaeefd0f766ffd2b1d641f0ec8809734858f 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5423,11 +5423,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                        break;
                }
 
-               case 0xFF0F:/*SMB2_INFO_QUERY_ALL_EAS*/
+               case SMB2_FILE_FULL_EA_INFORMATION:
                {
-                       /* This is FileFullEaInformation - 0xF which maps to
-                        * 1015 (decimal) in smbd_do_setfilepathinfo. */
-
                        /* We have data_size bytes to put EA's into. */
                        size_t total_ea_len = 0;
                        struct ea_list *ea_file_list = NULL;