[SCM] Samba Shared Repository - branch master updated - 53903d9eb1e50a98ff5fae305a1f74fc9ae73143

[Jeremy Allison]

The branch, master has been updated
       via  53903d9eb1e50a98ff5fae305a1f74fc9ae73143 (commit)
      from  f0e75484a7a4fc5646f7fed6cfb736a009526f59 (commit)

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


- Log -----------------------------------------------------------------
commit 53903d9eb1e50a98ff5fae305a1f74fc9ae73143
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 20 10:45:18 2008 -0800

    Fix the build, by some cut-and-paste error I got two versions of the same functions here.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index c28ba83..2edb441 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -625,52 +625,6 @@ static int sys_acl_set_file_xattr(vfs_handle_struct *handle,
 	}
 
 	become_root();
-	SMB_VFS_REMOVEXATTR(handle, name, XATTR_NTACL_NAME);
-	unbecome_root();
-
-	return ret;
-}
-
-/*********************************************************************
- Remove a Windows ACL - we're setting the underlying POSIX ACL.
-*********************************************************************/
-
-static int sys_acl_set_fd_xattr(vfs_handle_struct *handle,
-                            files_struct *fsp,
-                            SMB_ACL_T theacl)
-{
-	int ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle,
-						fsp,
-						theacl);
-	if (ret == -1) {
-		return -1;
-	}
-
-	become_root();
-	SMB_VFS_FREMOVEXATTR(handle, fsp, XATTR_NTACL_NAME);
-	unbecome_root();
-
-	return ret;
-}
-
-/*********************************************************************
- Remove a Windows ACL - we're setting the underlying POSIX ACL.
-*********************************************************************/
-
-static int sys_acl_set_file_xattr(vfs_handle_struct *handle,
-                              const char *name,
-                              SMB_ACL_TYPE_T type,
-                              SMB_ACL_T theacl)
-{
-	int ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle,
-						name,
-						type,
-						theacl);
-	if (ret == -1) {
-		return -1;
-	}
-
-	become_root();
 	SMB_VFS_REMOVEXATTR(handle->conn, name, XATTR_NTACL_NAME);
 	unbecome_root();
 
@@ -716,10 +670,6 @@ static vfs_op_tuple skel_op_tuples[] =
 	{SMB_VFS_OP(sys_acl_set_file_xattr), SMB_VFS_OP_SYS_ACL_SET_FILE, SMB_VFS_LAYER_TRANSPARENT},
 	{SMB_VFS_OP(sys_acl_set_fd_xattr), SMB_VFS_OP_SYS_ACL_SET_FD, SMB_VFS_LAYER_TRANSPARENT},
 
-	/* POSIX ACL operations. */
-	{SMB_VFS_OP(sys_acl_set_file_xattr), SMB_VFS_OP_SYS_ACL_SET_FILE, SMB_VFS_LAYER_TRANSPARENT},
-	{SMB_VFS_OP(sys_acl_set_fd_xattr), SMB_VFS_OP_SYS_ACL_SET_FD, SMB_VFS_LAYER_TRANSPARENT},
-
 	{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
 };
 


-- 
Samba Shared Repository