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

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  eea0985... parent_sd can never be null in this function, so don't 
check for it.
      from  aab1e42... Hopefullt final fix for 6802 - acl_xattr.c module: A 
created folder does not properly inherit permissions from parent and 6938 - No 
hook exists to check creation rights when using acl_xattr module

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


- Log -----------------------------------------------------------------
commit eea09855f381d435b76298069b67e2d331b41f8c
Author: Jeremy Allison <j...@samba.org>
Date:   Mon Dec 7 14:41:09 2009 -0800

    parent_sd can never be null in this function, so don't
    check for it.
    
    Jeremy.
    (cherry picked from commit a24631007ea4dcf25e777070d783608f988a5f94)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 735660d..06bcfb8 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -298,7 +298,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
        struct security_descriptor *psd = NULL;
        size_t size;
 
-       if (!parent_desc || !sd_has_inheritable_components(parent_desc, 
is_directory)) {
+       if (!sd_has_inheritable_components(parent_desc, is_directory)) {
                return NT_STATUS_OK;
        }
 
@@ -721,6 +721,10 @@ static NTSTATUS create_file_acl_common(struct 
vfs_handle_struct *handle,
                struct security_descriptor,
                goto err);
 
+       if (!parent_sd) {
+               goto err;
+       }
+
        /* New directory - inherit from parent. */
        status1 = inherit_new_acl(handle, fsp, parent_sd, fsp->is_directory);
 


-- 
Samba Shared Repository