From 5d7d52ceea6ac046940ae0a8112ee7ba79ce886d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 23 Jun 2011 15:06:16 -0700 Subject: Fix bug #8254 - "acl check permissions = no" does not work in all cases Move lp_acl_check_permissions() into can_delete_file_in_directory() where it makes sense. Remove ACL check when requesting DELETE_ACCESS when lp_acl_check_permissions is false. Thanks to John Janosik @ IBM for noticing this. Autobuild-User: Jeremy Allison Autobuild-Date: Fri Jun 24 01:18:11 CEST 2011 on sn-devel-104 --- source3/smbd/file_access.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/smbd/file_access.c') diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index 960dcb703a5..74855649ea2 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -92,6 +92,11 @@ bool can_delete_file_in_directory(connection_struct *conn, return False; } + if (!lp_acl_check_permissions(SNUM(conn))) { + /* This option means don't check. */ + return true; + } + /* Get the parent directory permission mask and owners. */ if (!parent_dirname(ctx, smb_fname->base_name, &dname, NULL)) { return False; -- cgit