From: Jeremy Allison <jra@samba.org>
Date: Thu, 28 Jul 2022 18:49:35 +0000 (-0700)
Subject: s3: smbd: Add src_dirfsp and dst_dirfsp parameters to copy_internals().
X-Git-Tag: samba-4.17.0rc1~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6c34ec3c2598ad364444da829b9fff23996cebc;p=thirdparty%2Fsamba.git

s3: smbd: Add src_dirfsp and dst_dirfsp parameters to copy_internals().

Not yet used.

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

diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index 930eec02739..042144bfc4d 100644
--- a/source3/modules/vfs_crossrename.c
+++ b/source3/modules/vfs_crossrename.c
@@ -115,7 +115,9 @@ static NTSTATUS copy_reg(vfs_handle_struct *handle,
 	status = copy_internals(talloc_tos(),
 				handle->conn,
 				NULL,
+				srcfsp, /* src_dirfsp */
 				full_fname_src,
+				dstfsp, /* dst_dirfsp */
 				full_fname_dst,
 				FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 9bb31b1ed28..b2bd5d0e894 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -698,7 +698,9 @@ NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
 NTSTATUS copy_internals(TALLOC_CTX *ctx,
 			connection_struct *conn,
 			struct smb_request *req,
+			struct files_struct *src_dirfsp,
 			struct smb_filename *smb_fname_src,
+			struct files_struct *dst_dirfsp,
 			struct smb_filename *smb_fname_dst,
 			uint32_t attrs);
 NTSTATUS smbd_do_query_security_desc(connection_struct *conn,
diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index ea56f56cea3..141737856f9 100644
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -1560,7 +1560,9 @@ void reply_ntrename(struct smb_request *req)
 			status = copy_internals(ctx,
 						conn,
 						req,
+						NULL, /* src_dirfsp */
 						smb_fname_old,
+						NULL, /* dst_dirfsp */
 						smb_fname_new,
 						attrs);
 			break;
diff --git a/source3/smbd/smb2_nttrans.c b/source3/smbd/smb2_nttrans.c
index a7e4c0f5c85..84defa3f052 100644
--- a/source3/smbd/smb2_nttrans.c
+++ b/source3/smbd/smb2_nttrans.c
@@ -197,7 +197,9 @@ NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
 NTSTATUS copy_internals(TALLOC_CTX *ctx,
 			connection_struct *conn,
 			struct smb_request *req,
+			struct files_struct *src_dirfsp,
 			struct smb_filename *smb_fname_src,
+			struct files_struct *dst_dirfsp,
 			struct smb_filename *smb_fname_dst,
 			uint32_t attrs)
 {
@@ -246,7 +248,7 @@ NTSTATUS copy_internals(TALLOC_CTX *ctx,
         status = SMB_VFS_CREATE_FILE(
 		conn,					/* conn */
 		req,					/* req */
-		NULL,					/* dirfsp */
+		src_dirfsp,				/* dirfsp */
 		smb_fname_src,				/* fname */
 		FILE_READ_DATA|FILE_READ_ATTRIBUTES|
 			FILE_READ_EA,			/* access_mask */
@@ -272,7 +274,7 @@ NTSTATUS copy_internals(TALLOC_CTX *ctx,
         status = SMB_VFS_CREATE_FILE(
 		conn,					/* conn */
 		req,					/* req */
-		NULL,					/* dirfsp */
+		dst_dirfsp,				/* dirfsp */
 		smb_fname_dst,				/* fname */
 		FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|
 			FILE_WRITE_EA,			/* access_mask */