[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  8e77a75... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir 
status return if access denied. Jeremy. (cherry picked from commit 
48f40793ae4190ebc9eec83924aeda9e3f16bf0d)
      from  70c4293... Fix bug 6938 : No hook exists to check creation rights 
when using acl_xattr module Fix ACL modules to test for permissions on 
open/mkdir/opendir. Ensure that underlying ACLs are returned for 
directories/files with no Windows xattr or tdb acls stored. Jeremy. (cherry 
picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 8e77a754190dfdece3b4786eaee97eab96a97c1e
Author: Jeremy Allison <j...@samba.org>
Date:   Mon Nov 30 16:56:35 2009 -0800

    Fix DEBUG 0 -> DEBUG 10 (left over code).
    Fix opendir status return if access denied.
    Jeremy.
    (cherry picked from commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d)

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_acl_common.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0919dcc..116211c 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -512,7 +512,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
                                         DACL_SECURITY_INFORMATION),
                                        &parent_desc);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
+               DEBUG(10,("check_parent_acl_common: SMB_VFS_GET_NT_ACL "
                        "on directory %s for "
                        "path %s returned %s\n",
                        parent_name,
@@ -525,7 +525,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct 
*handle,
                                        access_mask,
                                        &access_granted);
        if(!NT_STATUS_IS_OK(status)) {
-               DEBUG(0,("check_parent_acl_common: access check "
+               DEBUG(10,("check_parent_acl_common: access check "
                        "on directory %s for "
                        "path %s for mask 0x%x returned %s\n",
                        parent_name,
@@ -783,6 +783,8 @@ static SMB_STRUCT_DIR *opendir_acl_common(vfs_handle_struct 
*handle,
        NTSTATUS status = check_parent_acl_common(handle, fname, SEC_DIR_LIST);
 
        if (!NT_STATUS_IS_OK(status)) {
+               errno = map_errno_from_nt_status(status);
+               return NULL;
        }
        return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
 }


-- 
Samba Shared Repository