Comment out the parent inheritance code (this is incorrect) as was

done for POSIX ACLs.
Jeremy.
(cherry picked from commit 19b6d80d6bb1d144ac0a303b09e208750b959ee6)

diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c
index 90de8e01ff5fa2b7b071433ba06872c7847705f7..ec6fb5af9db76fbe5eb76c29e6b7ecd32fe6e4b4 100644 (file)
--- a/source/modules/vfs_acl_tdb.c
+++ b/source/modules/vfs_acl_tdb.c
@@ -740,6 +740,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
                psd = nc_psd;
        }
 
+#if 0
        if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
                        psd->dacl != NULL &&
                        (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
@@ -755,6 +756,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
                }
                psd = new_psd;
        }
+#endif
 
        if (DEBUGLEVEL >= 10) {
                DEBUG(10,("fset_nt_acl_tdb: storing tdb sd for file %s\n",

diff --git a/source/modules/vfs_acl_xattr.c b/source/modules/vfs_acl_xattr.c
index 5eae53c9628f2ed9d989b3eba4f5f210000bfd37..b53913b76d38120161af1c70bfd586c742afa087 100644 (file)
--- a/source/modules/vfs_acl_xattr.c
+++ b/source/modules/vfs_acl_xattr.c
@@ -579,6 +579,7 @@ static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp,
                psd = nc_psd;
        }
 
+#if 0
        if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
                        psd->dacl != NULL &&
                        (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
@@ -594,6 +595,7 @@ static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp,
                }
                psd = new_psd;
        }
+#endif
 
        if (DEBUGLEVEL >= 10) {
                DEBUG(10,("fset_nt_acl_xattr: storing xattr sd for file %s\n",