From: Jeremy Allison <jra@samba.org>
Date: Thu, 28 Jul 2022 19:29:22 +0000 (-0700)
Subject: s3: smbd: Convert smb2_file_rename_information() to use filename_convert_dirfsp().
X-Git-Tag: samba-4.17.0rc1~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e960f4b30bf735aa50edffca96641f8607c9353d;p=thirdparty%2Fsamba.git

s3: smbd: Convert smb2_file_rename_information() to use filename_convert_dirfsp().

One less use of filename_convert().

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

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index f465694a0bf..f2d6e59da34 100644
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -4951,9 +4951,11 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 	bool overwrite;
 	uint32_t len;
 	char *newname = NULL;
+	struct files_struct *dst_dirfsp = NULL;
 	struct smb_filename *smb_fname_dst = NULL;
 	const char *dst_original_lcomp = NULL;
 	uint32_t ucf_flags = ucf_flags_from_smb_request(req);
+	NTTIME dst_twrp = 0;
 	NTSTATUS status = NT_STATUS_OK;
 	TALLOC_CTX *ctx = talloc_tos();
 
@@ -5011,12 +5013,16 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 			goto out;
 		}
 	} else {
-		status = filename_convert(ctx,
-					conn,
-					newname,
-					ucf_flags,
-					0,
-					&smb_fname_dst);
+		if (ucf_flags & UCF_GMT_PATHNAME) {
+			extract_snapshot_token(newname, &dst_twrp);
+		}
+		status = filename_convert_dirfsp(ctx,
+						 conn,
+						 newname,
+						 ucf_flags,
+						 dst_twrp,
+						 &dst_dirfsp,
+						 &smb_fname_dst);
 		if (!NT_STATUS_IS_OK(status)) {
 			goto out;
 		}