[SCM] Samba Shared Repository - branch master updated - 4283ae489b6e227beba196e8a315a9727f03cc07

[Jeremy Allison]

The branch, master has been updated
       via  4283ae489b6e227beba196e8a315a9727f03cc07 (commit)
       via  f9bb8fbe832409893b17f2113d7b35b9ffe91540 (commit)
      from  d031472227b44d040698e6dff52dc79028fde854 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4283ae489b6e227beba196e8a315a9727f03cc07
Merge: f9bb8fbe832409893b17f2113d7b35b9ffe91540 d031472227b44d040698e6dff52dc79028fde854
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 18 15:40:05 2008 -0800

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit f9bb8fbe832409893b17f2113d7b35b9ffe91540
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 18 15:38:28 2008 -0800

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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 915f732..9cb887a 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 2edb441..3c8f241 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",


-- 
Samba Shared Repository