From: Jeremy Allison <jra@samba.org>
Date: Tue, 19 Sep 2023 17:03:05 +0000 (-0700)
Subject: s3: smbd: Now we have shown dst_dirfsp is always NULL, remove the parameter from... 
X-Git-Tag: tevent-0.16.0~541
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e94796e7c49b5396a42ceca9c76eb3453975ade6;p=thirdparty%2Fsamba.git

s3: smbd: Now we have shown dst_dirfsp is always NULL, remove the parameter from rename_internals().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 1b54a86dc54..17d48a757fa 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -982,7 +982,6 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
 			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,
 			const char *dst_original_lcomp,
 			uint32_t attrs,
diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index fe605f4d16d..82578ae6596 100644
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -1577,7 +1577,6 @@ void reply_ntrename(struct smb_request *req)
 						req,
 						src_dirfsp,
 						smb_fname_old,
-						NULL,
 						smb_fname_new,
 						dst_original_lcomp,
 						attrs,
diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index fe93c293735..5c2ec449219 100644
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -6481,7 +6481,6 @@ void reply_mv(struct smb_request *req)
 				req,
 				src_dirfsp, /* src_dirfsp */
 				smb_fname_src,
-				NULL, /* dst_dirfsp */
 				smb_fname_dst,
 				dst_original_lcomp,
 				attrs,
diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index a8edaa19476..ce7f59aa7b9 100644
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1847,7 +1847,6 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
 			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,
 			const char *dst_original_lcomp,
 			uint32_t attrs,
diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 9158b098c44..377a484eaff 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -4764,7 +4764,6 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
 					req,
 					NULL, /* src_dirfsp */
 					smb_fname_src,
-					NULL,
 					smb_fname_dst,
 					dst_original_lcomp,
 					0,