From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Jun 2021 18:18:34 +0000 (-0700)
Subject: s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_ac... 
X-Git-Tag: tevent-0.11.0~529
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd7c489cd3829085d3638e3b0dbfbb915d18a25a;p=thirdparty%2Fsamba.git

s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp().

Last user of smbd_check_access_rights().

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

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 0f3ad4ba844..581c11cb7fe 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -123,13 +123,8 @@ bool can_delete_file_in_directory(connection_struct *conn,
 	 * check the file DELETE permission separately.
 	 */
 
-	/*
-	 * NB. When dirfsp != conn->cwd_fsp, we must
-	 * change smb_fname_parent to be "." for the name here.
-	 */
-	ret = NT_STATUS_IS_OK(smbd_check_access_rights(conn,
-				dirfsp,
-				smb_fname_parent,
+	ret = NT_STATUS_IS_OK(smbd_check_access_rights_fsp(
+				smb_fname_parent->fsp,
 				false,
 				FILE_DELETE_CHILD));
  out: