From 19b6d80d6bb1d144ac0a303b09e208750b959ee6 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Dec 2008 15:36:34 -0800 Subject: [PATCH] Comment out the parent inheritance code (this is incorrect) as was done for POSIX ACLs. Jeremy. --- source/modules/vfs_acl_tdb.c | 2 ++ source/modules/vfs_acl_xattr.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c index 90de8e01ff5..ec6fb5af9db 100644 --- 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 5eae53c9628..b53913b76d3 100644 --- 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", -- 2.34.1