diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-12-19 11:01:25 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-12-19 11:01:25 +1100 |
| commit | cbddddb6cdebcb2edfeb39db2fbea0bfeaee5d88 (patch) | |
| tree | a960a4d3b11e3fb2c7c904ebac4dbafbfdd7eb21 /source3 | |
| parent | 43f232fcc9b3243781fa3c729f046a737be16720 (diff) | |
| parent | 4283ae489b6e227beba196e8a315a9727f03cc07 (diff) | |
| download | samba-cbddddb6cdebcb2edfeb39db2fbea0bfeaee5d88.tar.gz samba-cbddddb6cdebcb2edfeb39db2fbea0bfeaee5d88.tar.bz2 samba-cbddddb6cdebcb2edfeb39db2fbea0bfeaee5d88.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3')
| -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", |