From: Volker Lendecke <vl@samba.org>
Date: Thu, 25 Jul 2019 14:20:04 +0000 (+0200)
Subject: smbd: Remove "share_access" from dup_file_fsp()
X-Git-Tag: tdb-1.4.2~292
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c56be509f1f7957057243047470f7bbf26186b2c;p=thirdparty%2Fsamba.git

smbd: Remove "share_access" from dup_file_fsp()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index a445b9881bf..0369d36e22d 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -688,9 +688,12 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
  Duplicate the file handle part for a DOS or FCB open.
 ****************************************************************************/
 
-NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *from,
-		      uint32_t access_mask, uint32_t share_access,
-		      uint32_t create_options, files_struct *to)
+NTSTATUS dup_file_fsp(
+	struct smb_request *req,
+	files_struct *from,
+	uint32_t access_mask,
+	uint32_t create_options,
+	files_struct *to)
 {
 	/* this can never happen for print files */
 	SMB_ASSERT(from->print_file == NULL);
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 100805d3253..d907112a5b5 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -406,9 +406,12 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
 struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
 				   uint64_t persistent_id,
 				   uint64_t volatile_id);
-NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *from,
-		      uint32_t access_mask, uint32_t share_access,
-		      uint32_t create_options, files_struct *to);
+NTSTATUS dup_file_fsp(
+	struct smb_request *req,
+	files_struct *from,
+	uint32_t access_mask,
+	uint32_t create_options,
+	files_struct *to);
 NTSTATUS file_name_hash(connection_struct *conn,
 			const char *name, uint32_t *p_name_hash);
 NTSTATUS fsp_set_smb_fname(struct files_struct *fsp,
diff --git a/source3/smbd/smb1_utils.c b/source3/smbd/smb1_utils.c
index 8a7e66e2ae3..89290b25535 100644
--- a/source3/smbd/smb1_utils.c
+++ b/source3/smbd/smb1_utils.c
@@ -99,7 +99,6 @@ struct files_struct *fcb_or_dos_open(
 		req,
 		fsp,
 		access_mask,
-		share_access,
 		create_options,
 		new_fsp);