From 1509ba3c44e7f092377360b71eee2c9916eefdb9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 24 May 2021 16:51:16 -0700 Subject: [PATCH] s3: smbd: In open_file_ntcreate(), remove the local parent_dir_fname and rename the passed in parameter to be the same. open_file() can now use parent_dir_fname->fsp for handle-based access calls. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/smbd/open.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index fa846fbc80a..120d6bb58fe 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -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; -- 2.47.3