diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-18 15:38:28 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-18 15:38:28 -0800 |
| commit | f9bb8fbe832409893b17f2113d7b35b9ffe91540 (patch) | |
| tree | 744ffdbf7318c35e6e8b4f9cd74b2a8c766e6dfa | |
| parent | 99f7f737356a83348aeda1723d7e1b846a4693c1 (diff) | |
| download | samba-f9bb8fbe832409893b17f2113d7b35b9ffe91540.tar.gz samba-f9bb8fbe832409893b17f2113d7b35b9ffe91540.tar.bz2 samba-f9bb8fbe832409893b17f2113d7b35b9ffe91540.zip | |
Comment out the parent inheritance code (this is incorrect) as was
done for POSIX ACLs.
Jeremy.
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 915f73233d..9cb887ae51 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/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/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 2edb441741..3c8f241ad9 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/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", |