From: Jeremy Allison <jra@samba.org>
Date: Thu, 28 Jul 2022 17:54:03 +0000 (-0700)
Subject: s3: smbd: Convert smbd_smb2_create_durable_lease_check() to use filename_convert_dirf... 
X-Git-Tag: samba-4.17.0rc1~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab9397726efd075274f1f8c4c75f8dedac2b95e7;p=thirdparty%2Fsamba.git

s3: smbd: Convert smbd_smb2_create_durable_lease_check() 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_create.c b/source3/smbd/smb2_create.c
index eae522a0619..dbafaf01597 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -424,9 +424,11 @@ static NTSTATUS smbd_smb2_create_durable_lease_check(struct smb_request *smb1req
 	const char *requested_filename, const struct files_struct *fsp,
 	const struct smb2_lease *lease_ptr)
 {
+	struct files_struct *dirfsp = NULL;
 	char *filename = NULL;
 	struct smb_filename *smb_fname = NULL;
 	uint32_t ucf_flags;
+	NTTIME twrp = fsp->fsp_name->twrp;
 	NTSTATUS status;
 
 	if (lease_ptr == NULL) {
@@ -464,9 +466,13 @@ static NTSTATUS smbd_smb2_create_durable_lease_check(struct smb_request *smb1req
 	}
 
 	ucf_flags = filename_create_ucf_flags(smb1req, FILE_OPEN);
-	status = filename_convert(talloc_tos(), fsp->conn,
-				  filename, ucf_flags,
-				  0, &smb_fname);
+	status = filename_convert_dirfsp(talloc_tos(),
+					 fsp->conn,
+					 filename,
+					 ucf_flags,
+					 twrp,
+					 &dirfsp,
+					 &smb_fname);
 	TALLOC_FREE(filename);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(10, ("filename_convert returned %s\n",