]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_ac...
authorJeremy Allison <jra@samba.org>
Tue, 8 Jun 2021 18:18:34 +0000 (11:18 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 9 Jun 2021 13:14:31 +0000 (13:14 +0000)
Last user of smbd_check_access_rights().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/file_access.c

index 0f3ad4ba844b86e28ad7cc56e81eb8303cbc32f8..581c11cb7fe8264cac73dd781153dbc7e05c6046 100644 (file)
@@ -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: