From: Ralph Boehme <slow@samba.org>
Date: Thu, 26 Mar 2020 13:49:33 +0000 (+0100)
Subject: smbd: use filename_convert() in smb_file_rename_information()
X-Git-Tag: ldb-2.2.0~1195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41fbfc279b9d0f784115e01ddaa231943df46329;p=thirdparty%2Fsamba.git

smbd: use filename_convert() in smb_file_rename_information()

Replaces direct calls to resolve_dfspath_wcard() and filename_convert(). On the
way to consolidate all callers of pathname processing onto filename_convert().

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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 5b7333773bb..73510d8ae46 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7326,18 +7326,6 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
 	DEBUG(10,("smb_file_rename_information: got name |%s|\n",
 				newname));
 
-	if (req->flags2 & FLAGS2_DFS_PATHNAMES) {
-		status = resolve_dfspath_wcard(ctx, conn,
-				       newname,
-				       UCF_COND_ALLOW_WCARD_LCOMP,
-				       !conn->sconn->using_smb2,
-				       &newname,
-				       &dest_has_wcard);
-		if (!NT_STATUS_IS_OK(status)) {
-			return status;
-		}
-	}
-
 	/* Check the new name has no '/' characters. */
 	if (strchr_m(newname, '/')) {
 		return NT_STATUS_NOT_SUPPORTED;
@@ -7415,8 +7403,13 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
 			return NT_STATUS_NO_MEMORY;
 		}
 
-		status = unix_convert(ctx, conn, base_name, &smb_fname_dst,
-					ucf_flags);
+		status = filename_convert(ctx,
+					  conn,
+					  base_name,
+					  ucf_flags,
+					  NULL,
+					  NULL,
+					  &smb_fname_dst);
 
 		/* If an error we expect this to be
 		 * NT_STATUS_OBJECT_PATH_NOT_FOUND */