From 1d658bbe65a5a037efa403250c9513a50b5dc8be Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 28 Jul 2022 11:25:48 -0700 Subject: [PATCH] s3: smbd: Add dst_dirfsp parameter to rename_internals_fsp(). Not yet used, but when this is fully plumbed though we can look at optimizing and removing the code inside rename_internals_fsp() that currently gets it's own dst_dirfsp. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke --- source3/smbd/proto.h | 1 + source3/smbd/smb2_reply.c | 2 ++ source3/smbd/smb2_trans2.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index f0f2b4f6e61..64dd0b7647b 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -984,6 +984,7 @@ ssize_t sendfile_short_send(struct smbXsrv_connection *xconn, size_t smb_maxcnt); NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, + struct files_struct *dst_dirfsp, struct smb_filename *smb_fname_dst_in, const char *dst_original_lcomp, uint32_t attrs, diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c index d83d2473aae..6f3a2c214f5 100644 --- a/source3/smbd/smb2_reply.c +++ b/source3/smbd/smb2_reply.c @@ -1272,6 +1272,7 @@ static NTSTATUS parent_dirname_compatible_open(connection_struct *conn, NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, + struct files_struct *dst_dirfsp, struct smb_filename *smb_fname_dst_in, const char *dst_original_lcomp, uint32_t attrs, @@ -1811,6 +1812,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx, status = rename_internals_fsp(conn, fsp, + dst_dirfsp, smb_fname_dst, dst_original_lcomp, attrs, diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c index 118eb480911..ee5704aeec6 100644 --- a/source3/smbd/smb2_trans2.c +++ b/source3/smbd/smb2_trans2.c @@ -5027,6 +5027,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn, smb_fname_str_dbg(smb_fname_dst))); status = rename_internals_fsp(conn, fsp, + NULL, /* dst_dirfsp */ smb_fname_dst, dst_original_lcomp, (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM), @@ -5285,6 +5286,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn, smb_fname_str_dbg(smb_fname_dst))); status = rename_internals_fsp(conn, fsp, + NULL, /* dst_dirfsp */ smb_fname_dst, dst_original_lcomp, 0, -- 2.47.3