[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4719-g19b6d80

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  19b6d80d6bb1d144ac0a303b09e208750b959ee6 (commit)
      from  61ec751fe3560b47681d414506eca934786e122d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 19b6d80d6bb1d144ac0a303b09e208750b959ee6
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 18 15:36:34 2008 -0800

    Comment out the parent inheritance code (this is incorrect) as was
    done for POSIX ACLs.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_acl_tdb.c   |    2 ++
 source/modules/vfs_acl_xattr.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c
index 90de8e0..ec6fb5a 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 5eae53c..b53913b 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",


-- 
Samba Shared Repository