smbd: convert fsp->posix_flags to fsp->fsp_flags.posix_open

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Oct 25 11:50:01 UTC 2024 on atb-devel-224

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 522bf6e4fe49b53de2538d39c0234bdb1f17fb8b..75a110bfcf625e9c8998980ba8f7f911ef87a7da 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -384,6 +384,9 @@
  * Change to Version 50 - will ship with 4.22
  * Version 50 - Change SMB_VFS_RENAMEAT() add vfs_rename_how
  * Version 50 - Add VFS_RENAME_HOW_NO_REPLACE to vfs_rename_how
+ * Version 50 - Remove FSP_POSIX_FLAGS_PATHNAMES, remove FSP_POSIX_FLAGS_RENAME
+ *              and convert struct files_struct.posix_flags to
+ *              struct files_struct.fsp_flags.posix_open
  */
 
 #define SMB_VFS_INTERFACE_VERSION 50
@@ -458,6 +461,7 @@ typedef struct files_struct {
                bool lock_failure_seen : 1;
                bool encryption_required : 1;
                bool fstat_before_close : 1;
+               bool posix_open : 1;
        } fsp_flags;
 
        struct tevent_timer *update_write_time_event;
@@ -684,11 +688,6 @@ typedef struct files_struct {
  * In any other case use fsp_get_io_fd().
  */
 
-#define FSP_POSIX_FLAGS_OPEN           0x01
-
-#define FSP_POSIX_FLAGS_ALL                    \
-       FSP_POSIX_FLAGS_OPEN
-
 struct vuid_cache_entry {
        struct auth_session_info *session_info;
        struct name_compare_entry *hide_list;
@@ -886,12 +885,7 @@ struct smb_filename {
        struct fsp_smb_fname_link *fsp_link;
 };
 
-/*
- * smb_filename flags. Define in terms of the FSP_POSIX_FLAGS_XX
- * to keep the numeric values consistent.
- */
-
-#define SMB_FILENAME_POSIX_PATH                FSP_POSIX_FLAGS_OPEN
+#define SMB_FILENAME_POSIX_PATH                0x01
 
 enum vfs_translate_direction {
        vfs_translate_to_unix = 0,

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 4bbccdcd3bd142111b5afc74d612d235e69ec189..1db9b887907fd8f899f91df2be812a96aa8402fe 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -2022,7 +2022,7 @@ bool set_share_mode(struct share_mode_lock *lck,
                .time.tv_usec = fsp->open_time.tv_usec,
                .share_file_id = fh_get_gen_id(fsp->fh),
                .uid = (uint32_t)uid,
-               .flags = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+               .flags = fsp->fsp_flags.posix_open ?
                        SHARE_MODE_FLAG_POSIX_OPEN : 0,
                .name_hash = fsp->name_hash,
        };

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f38029cf221b4967ee5fdbc5e19235a789aa3ce4..f098b7f1e79277b1284236fd734d3282c816615d 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -1172,7 +1172,7 @@ int unlink_acl_common(struct vfs_handle_struct *handle,
 int fchmod_acl_module_common(struct vfs_handle_struct *handle,
                             struct files_struct *fsp, mode_t mode)
 {
-       if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN
+       if (fsp->fsp_flags.posix_open
            || fsp->fsp_name->flags & SMB_FILENAME_POSIX_PATH) {
                /* Only allow this on POSIX opens. */
                return SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6a0f7321017ea6f372f4a2c955ff4829aaf8e991..0596573176dfe6ccd395bbdd5b9ca6630368979f 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4686,7 +4686,7 @@ enum brl_flavour lp_posix_cifsu_locktype(files_struct *fsp)
        if (posix_default_lock_was_set) {
                return posix_cifsx_locktype;
        } else {
-               return (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+               return fsp->fsp_flags.posix_open ?
                        POSIX_LOCK : WINDOWS_LOCK;
        }
 }

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 86cb2a49f919f57b17216c5bbb923451d3a9564b..8fb2a3fc016c7aa3347aeb67daa457ab4543f476 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1133,7 +1133,7 @@ static NTSTATUS OpenDir_fsp(
                goto fail;
        }
        dir_hnd->fsp = fsp;
-       if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+       if (fsp->fsp_flags.posix_open) {
                dir_hnd->case_sensitive = true;
        } else {
                dir_hnd->case_sensitive = conn->case_sensitive;

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index e59c234fedb649f0a338985442cd67290b866a1b..1b68f10c86f2d97a45f5f723836d46192043fc49 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -947,7 +947,7 @@ int file_set_dosmode(connection_struct *conn,
                return -1;
        }
 
-       if ((smb_fname->fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) &&
+       if (smb_fname->fsp->fsp_flags.posix_open &&
            !lp_store_dos_attributes(SNUM(conn)))
        {
                return 0;

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index ed62159a4955976616a9514614c3d96bf89ed0e4..fc6668e41866fa82d826d01ff15c22bb2477460d 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -148,7 +148,7 @@ void trigger_write_time_update(struct files_struct *fsp)
 {
        int delay;
 
-       if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+       if (fsp->fsp_flags.posix_open) {
                /* Don't use delayed writes on POSIX files. */
                return;
        }
@@ -195,7 +195,7 @@ void trigger_write_time_update_immediate(struct files_struct *fsp)
 
        init_smb_file_time(&ft);
 
-       if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+       if (fsp->fsp_flags.posix_open) {
                /* Don't use delayed writes on POSIX files. */
                return;
        }

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index dcb6c286d8dee30999455d32002886e296d0153e..a46ae9385699d34943539e5ddab48872584c4aac 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -2625,7 +2625,7 @@ static bool fsp_generic_ask_sharemode(struct files_struct *fsp)
                return false;
        }
 
-       if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+       if (fsp->fsp_flags.posix_open) {
                /* Always use filesystem for UNIX mtime query. */
                return false;
        }

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index f132587fb8c8549ad0aa480064595d218e3f71a7..0d05bd953c0134da149f62176317cf3c4de70068 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -866,7 +866,7 @@ NTSTATUS fd_openat(const struct files_struct *dirfsp,
         * client should be doing this.
         */
 
-       if ((fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) || !lp_follow_symlinks(SNUM(conn))) {
+       if (fsp->fsp_flags.posix_open || !lp_follow_symlinks(SNUM(conn))) {
                how.flags |= O_NOFOLLOW;
        }
 
@@ -1270,7 +1270,7 @@ static NTSTATUS open_file(
                SEC_FLAG_SYSTEM_SECURITY;
        bool creating = !file_existed && (how.flags & O_CREAT);
        bool open_fd = false;
-       bool posix_open = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN);
+       bool posix_open = fsp->fsp_flags.posix_open;
 
        /*
         * Catch early an attempt to open an existing
@@ -4223,7 +4223,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                                              * requested access_mask after
                                              * the open is done. */
        if (posix_open) {
-               fsp->posix_flags |= FSP_POSIX_FLAGS_ALL;
+               fsp->fsp_flags.posix_open = true;
        }
 
        if ((create_options & FILE_DELETE_ON_CLOSE) && (flags & O_CREAT) &&
@@ -5349,7 +5349,7 @@ static NTSTATUS open_directory(connection_struct *conn,
        fsp->sent_oplock_break = NO_BREAK_SENT;
        fsp->fsp_flags.is_directory = true;
        if (file_attributes & FILE_FLAG_POSIX_SEMANTICS) {
-               fsp->posix_flags |= FSP_POSIX_FLAGS_ALL;
+               fsp->fsp_flags.posix_open = true;
        }
 
        /* Don't store old timestamps for directory

diff --git a/source3/smbd/smb1_trans2.c b/source3/smbd/smb1_trans2.c
index 666a8ebb2a62a09921f1c4d46c5407103125ff29..0dba3d83df42432a7c553edc5a1ec8afcf381618 100644 (file)
--- a/source3/smbd/smb1_trans2.c
+++ b/source3/smbd/smb1_trans2.c
@@ -1508,7 +1508,7 @@ static void call_trans2findnext(connection_struct *conn,
         */
 
        if(!continue_bit && resume_name && *resume_name) {
-               bool posix_open = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN);
+               bool posix_open = fsp->fsp_flags.posix_open;
                char *last_name_sent = NULL;
                bool sequential;
 

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 7c43a4e923d0c5568c7483dd55cfde4761654af2..2a61f9635162e04e80d1797b490b2e0ea5e50449 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -339,7 +339,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                        break;
 
                case SMB2_FILE_POSIX_INFORMATION:
-                       if (!(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN)) {
+                       if (!fsp->fsp_flags.posix_open) {
                                tevent_req_nterror(req, NT_STATUS_INVALID_LEVEL);
                                return tevent_req_post(req, ev);
                        }

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index c9d810f71ba228fc338549509c1169f7c35db1f2..58610a52faa0f126d8575e527a002c17d51ebb88 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -381,7 +381,7 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
 
        for (i=0; i<in_lock_count; i++) {
                bool invalid = false;
-               bool posix_handle =(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN);
+               bool posix_handle = fsp->fsp_flags.posix_open;
 
                switch (in_locks[i].flags) {
                case SMB2_LOCK_FLAG_SHARED:

diff --git a/source3/smbd/smb2_nttrans.c b/source3/smbd/smb2_nttrans.c
index 916bde53986fa58616a321871bccc863b19f4b15..33e5d13f4621852f12d80a719671e7214a2125e0 100644 (file)
--- a/source3/smbd/smb2_nttrans.c
+++ b/source3/smbd/smb2_nttrans.c
@@ -189,7 +189,7 @@ static bool check_smb2_posix_chmod_ace(const struct files_struct *fsp,
                return false;
        }
 
-       if (!(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN)) {
+       if (!fsp->fsp_flags.posix_open) {
                return false;
        }
 

diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index ebbbbb39911037402f05f511740763a0e45982ee..cfdcc52e93672ef64d526b9f474e3aaa697aae6b 100644 (file)
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -273,7 +273,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
        char *p;
        bool stop = false;
        bool ok;
-       bool posix_dir_handle = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN);
+       bool posix_dir_handle = fsp->fsp_flags.posix_open;
 
        req = tevent_req_create(mem_ctx, &state,
                                struct smbd_smb2_query_directory_state);
@@ -368,7 +368,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
                break;
 
        case SMB2_FIND_POSIX_INFORMATION:
-               if (!(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN)) {
+               if (!fsp->fsp_flags.posix_open) {
                        tevent_req_nterror(req, NT_STATUS_INVALID_LEVEL);
                        return tevent_req_post(req, ev);
                }

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index 8c314360b4aad5874e1eb1fa19365cbec6454121..d829e691ad27ea5a81222b1122c58d046a2323c1 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1409,9 +1409,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
        uint32_t access_mask = SEC_DIR_ADD_FILE;
        bool dst_exists, old_is_stream, new_is_stream;
        int ret;
-       bool case_sensitive = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+       bool case_sensitive = fsp->fsp_flags.posix_open ?
                                true : conn->case_sensitive;
-       bool case_preserve = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+       bool case_preserve = fsp->fsp_flags.posix_open ?
                                true : conn->case_preserve;
        struct vfs_rename_how rhow = { .flags = 0, };
 
@@ -1470,7 +1470,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
                 * can check them separately.
                 */
 
-               if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+               if (fsp->fsp_flags.posix_open) {
                        /* POSIX - no stream component. */
                        orig_lcomp_path = talloc_strdup(ctx,
                                                dst_original_lcomp);

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index fe19c391e0eefe94cb1ec3fd89f986cde6e0499d..b7b8781a60eda754789a09180cbe05710afcaedf 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -1960,7 +1960,7 @@ static bool fsinfo_unix_valid_level(connection_struct *conn,
                                    uint16_t info_level)
 {
        if (conn_using_smb2(conn->sconn) &&
-           (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) &&
+           fsp->fsp_flags.posix_open &&
            info_level == SMB2_FS_POSIX_INFORMATION_INTERNAL)
        {
                return true;
@@ -3006,7 +3006,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                }
 
                if (conn_using_smb2(conn->sconn) &&
-                   (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN))
+                   fsp->fsp_flags.posix_open)
                {
                        DBG_DEBUG("SMB2 posix open\n");
                        ok = true;
@@ -3677,7 +3677,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                        if (fsp == NULL) {
                                return NT_STATUS_INVALID_HANDLE;
                        }
-                       if (!(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN)) {
+                       if (!fsp->fsp_flags.posix_open) {
                                return NT_STATUS_INVALID_LEVEL;
                        }
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index ce9c9af3fd2c3412c2defe24f74aef93511c5179..16c084dda5181f61f3c1580fd6dbc7a8c3f4c166 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1172,7 +1172,7 @@ NTSTATUS vfs_stat_fsp(files_struct *fsp)
        }
 
        if (fsp_get_pathref_fd(fsp) == -1) {
-               if (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) {
+               if (fsp->fsp_flags.posix_open) {
                        ret = SMB_VFS_LSTAT(fsp->conn, fsp->fsp_name);
                } else {
                        ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name);