From: Ralph Boehme Date: Fri, 10 Apr 2020 14:52:07 +0000 (+0200) Subject: smbd: remove redundant conn arg from open_file() X-Git-Tag: ldb-2.2.0~416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a77f28dcca23c4a9b16d64748a3e97c89fc7ff8d;p=thirdparty%2Fsamba.git smbd: remove redundant conn arg from open_file() Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/source3/smbd/open.c b/source3/smbd/open.c index d5b4be42e97..a0221e69544 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1118,7 +1118,6 @@ static NTSTATUS fd_open_atomic(struct connection_struct *conn, ****************************************************************************/ static NTSTATUS open_file(files_struct *fsp, - connection_struct *conn, struct smb_request *req, struct smb_filename *parent_dir, int flags, @@ -1127,6 +1126,7 @@ static NTSTATUS open_file(files_struct *fsp, uint32_t open_access_mask, /* what we're actually using in the open. */ bool *p_file_created) { + connection_struct *conn = fsp->conn; struct smb_filename *smb_fname = fsp->fsp_name; NTSTATUS status = NT_STATUS_OK; int accmode = (flags & O_ACCMODE); @@ -3679,7 +3679,7 @@ 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, conn, req, parent_dir_fname, + fsp_open = open_file(fsp, req, parent_dir_fname, flags|flags2, unx_mode, access_mask, open_access_mask, &new_file_created);