]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: In open_file_ntcreate(), remove the local parent_dir_fname and rename the...
authorJeremy Allison <jra@samba.org>
Mon, 24 May 2021 23:51:16 +0000 (16:51 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 9 Jun 2021 13:14:30 +0000 (13:14 +0000)
open_file() can now use parent_dir_fname->fsp for handle-based
access calls.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/open.c

index fa846fbc80a9c06a675a8ce309d094de8d6b893d..120d6bb58fe3d41642d51836d01a217d7a9e6475 100644 (file)
@@ -3601,8 +3601,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                            const struct smb2_lease *lease,
                                                        /* Information (FILE_EXISTS etc.) */
                            uint32_t private_flags,     /* Samba specific flags. */
-                           struct smb_filename *parent_dir_fname_in, /* parent. */
-                           struct smb_filename *smb_fname_atname_in, /* atname relative to parent. */
+                           struct smb_filename *parent_dir_fname, /* parent. */
+                           struct smb_filename *smb_fname_atname, /* atname relative to parent. */
                            int *pinfo,
                            files_struct *fsp)
 {
@@ -3622,7 +3622,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        struct share_mode_lock *lck = NULL;
        uint32_t open_access_mask = access_mask;
        NTSTATUS status;
-       struct smb_filename *parent_dir_fname = parent_dir_fname_in;
        SMB_STRUCT_STAT saved_stat = smb_fname->st;
        struct timespec old_write_time;
        bool setup_poll = false;