parent_sd can never be null in this function, so don't

check for it.

Jeremy.

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 735660d4bdb784b7eb44f587d764bbcdd755650c..06bcfb856b1a0ec7ea9eacadf9b6a0f1e0ea26ab 100644 (file)
--- 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);