From: Volker Lendecke Date: Thu, 7 Apr 2022 09:26:59 +0000 (+0200) Subject: smbd: Align open_file() argument order with reopen_from_fsp() X-Git-Tag: tevent-0.12.0~142 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d05bc2e42d7d5600a49ef1c121ab88ae2e56121;p=thirdparty%2Fsamba.git smbd: Align open_file() argument order with reopen_from_fsp() dirfsp first, then dirfsp-relative atname, then fsp. smb_fname_atname will be used soon. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 1644d867566..e05e7556cd5 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1296,9 +1296,10 @@ static NTSTATUS reopen_from_fsp(struct files_struct *dirfsp, Open a file. ****************************************************************************/ -static NTSTATUS open_file(files_struct *fsp, - struct smb_request *req, +static NTSTATUS open_file(struct smb_request *req, struct files_struct *dirfsp, + struct smb_filename *smb_fname_atname, + files_struct *fsp, int flags, mode_t unx_mode, uint32_t access_mask, /* client requested access mask. */ @@ -3848,9 +3849,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, (unsigned int)unx_mode, (unsigned int)access_mask, (unsigned int)open_access_mask)); - fsp_open = open_file(fsp, - req, + fsp_open = open_file(req, parent_dir_fname->fsp, + smb_fname_atname, + fsp, flags|flags2, unx_mode, access_mask,