smbd: rename SMB2_FILE_POSIX_INFORMATION to FSCC_FILE_POSIX_INFORMATION

Streamline the info-level defines. Also get rid of
SMB2_FILE_POSIX_INFORMATION_INTERNAL which is not needed for an info-level that
is exclusive to SMB2.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/libcli/smb/smb_unix_ext.h b/libcli/smb/smb_unix_ext.h
index ca0470672ab2a242a98197401de2b254039fc562..72944d475af6d49e5f63f045993f4bf2bd9c43b9 100644 (file)
--- a/libcli/smb/smb_unix_ext.h
+++ b/libcli/smb/smb_unix_ext.h
@@ -417,6 +417,6 @@ enum smb_whoami_flags {
 
 #define INFO_LEVEL_IS_UNIX(level) ((((level) >= MIN_UNIX_INFO_LEVEL) && \
                        ((level) <= MAX_UNIX_INFO_LEVEL)) || \
-                       ((level) == SMB2_FILE_POSIX_INFORMATION_INTERNAL))
+                       ((level) == FSCC_FILE_POSIX_INFORMATION))
 
 #endif /* __SMB_UNIX_EXT_H__ */

diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index 52b942eb96327b0e69e0359055ce721aae91a229..9d5cfdea7e0bf1e33a0389bec4dd213a4be64b0d 100644 (file)
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -341,7 +341,7 @@ Byte offset   Type     name                description
 #define FSCC_FILE_MAXIMUM_INFORMATION                  55
 
 /* As yet undefined FSCC_ code for POSIX info level. */
-#define SMB2_FILE_POSIX_INFORMATION                    100
+#define FSCC_FILE_POSIX_INFORMATION                    100
 #define SMB2_FS_POSIX_INFORMATION                      100
 
 /* MS-FSCC 2.4 File System Information Classes */
@@ -412,7 +412,6 @@ Byte offset   Type     name                description
 #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)
-#define SMB2_FILE_POSIX_INFORMATION_INTERNAL           (SMB2_FILE_POSIX_INFORMATION + SMB2_INFO_SPECIAL)
 #define SMB2_FS_POSIX_INFORMATION_INTERNAL             (SMB2_FS_POSIX_INFORMATION + NT_PASSTHROUGH_OFFSET)
 
 /* NT passthrough levels for qfsinfo. */

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 78222270099852fc69d9f74d4ca264bc9dade954..f7802174cadab1526589fdf6f79cccf5e9191c8a 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -338,12 +338,12 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                        file_info_level = SMB2_FILE_ALL_INFORMATION;
                        break;
 
-               case SMB2_FILE_POSIX_INFORMATION:
+               case FSCC_FILE_POSIX_INFORMATION:
                        if (!fsp->fsp_flags.posix_open) {
                                tevent_req_nterror(req, NT_STATUS_INVALID_LEVEL);
                                return tevent_req_post(req, ev);
                        }
-                       file_info_level = SMB2_FILE_POSIX_INFORMATION_INTERNAL;
+                       file_info_level = in_file_info_class;
                        break;
 
                default:

diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 2c8fb4a97c72493de47bf1bee76ad3016614fc2f..7e039c096058f97c84b49d37f9a873fa127929eb 100644 (file)
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -372,7 +372,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
                        tevent_req_nterror(req, NT_STATUS_INVALID_LEVEL);
                        return tevent_req_post(req, ev);
                }
-               state->info_level = SMB2_FILE_POSIX_INFORMATION;
+               state->info_level = FSCC_FILE_POSIX_INFORMATION;
                break;
        default:
                tevent_req_nterror(req, NT_STATUS_INVALID_INFO_CLASS);

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 4fa72f34978be9463fbb0f3f8378fa1c62963402..960c4d748219b89196299156522a86bc93c0a32e 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -1680,7 +1680,7 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
 
        /* SMB2 UNIX Extension. */
 
-       case SMB2_FILE_POSIX_INFORMATION:
+       case FSCC_FILE_POSIX_INFORMATION:
                {
                        struct smb3_file_posix_information info = {};
                        uint8_t buf[sizeof(info)];
@@ -1692,7 +1692,7 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
                        enum ndr_err_code ndr_err;
                        uint32_t tag = 0;
 
-                       DBG_DEBUG("SMB2_FILE_POSIX_INFORMATION\n");
+                       DBG_DEBUG("FSCC_FILE_POSIX_INFORMATION\n");
 
                        p+= 4;
                        SIVAL(p,0,reskey); p+= 4;
@@ -3648,7 +3648,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                /*
                 * SMB2 UNIX Extensions.
                 */
-               case SMB2_FILE_POSIX_INFORMATION_INTERNAL:
+               case FSCC_FILE_POSIX_INFORMATION:
                {
                        struct smb3_file_posix_information info = {};
                        uint8_t buf[sizeof(info)];