From: Jeremy Allison <jra@samba.org>
Date: Fri, 3 Dec 2021 01:51:42 +0000 (-0800)
Subject: s3: smbd: In call_trans2findfirst() we don't need filename_convert_with_privilege... 
X-Git-Tag: tdb-1.4.6~337
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18a1cc632b4b799e0219554c8873024cb45f1b6a;p=thirdparty%2Fsamba.git

s3: smbd: In call_trans2findfirst() we don't need filename_convert_with_privilege() anymore.

It was extra-paranoid code now not needed as the new VFS
version of filename_convert() does the same job.

There are now no remaining callers of filename_convert_with_privilege().

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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 55857dd9119..5aabe244d45 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2757,19 +2757,12 @@ close_if_end = %d requires_resume_key = %d backup_priv = %d level = 0x%x, max_da
 	if (backup_priv) {
 		become_root();
 		as_root = true;
-		ntstatus = filename_convert_with_privilege(talloc_tos(),
-				conn,
-				req,
-				directory,
-				ucf_flags,
-				&smb_dname);
-	} else {
-		ntstatus = filename_convert(talloc_tos(), conn,
+	}
+	ntstatus = filename_convert(talloc_tos(), conn,
 				    directory,
 				    ucf_flags,
 				    0,
 				    &smb_dname);
-	}
 
 	if (!NT_STATUS_IS_OK(ntstatus)) {
 		if (NT_STATUS_EQUAL(ntstatus,NT_STATUS_PATH_NOT_COVERED)) {