From c5ad5029fd87b36426927d57425d5debbb26394c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 14 Nov 2012 14:40:51 -0800 Subject: More for #9374 - Allow smb2.acls torture test to pass against smbd with a POSIX ACLs backend. Change can_delete_directory() to can_delete_directory_fsp(), as we only ever call this from an open directory file handle. This allows us to use OpenDir_fsp() instead of OpenDir(). OpenDir() re-checks the ACL on the directory, which may refuse DIR_LIST permissions. OpenDir_fsp() does not. As this is a file-server internal check to see if the directory actually contains any files before setting delete on close, we can ignore the ACL here (Windows does). Signed-off-by: Jeremy Allison Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue Nov 20 01:46:28 CET 2012 on sn-devel-104 --- source3/include/proto.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/include/proto.h') diff --git a/source3/include/proto.h b/source3/include/proto.h index bcecde955d..6856dd7730 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1626,8 +1626,7 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp, enum file_close_type close_type); void send_stat_cache_delete_message(struct messaging_context *msg_ctx, const char *name); -NTSTATUS can_delete_directory(struct connection_struct *conn, - const char *dirname); +NTSTATUS can_delete_directory_fsp(files_struct *fsp); bool change_to_root_user(void); void contend_level2_oplocks_begin(files_struct *fsp, enum level2_contention_type type); -- cgit