diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-20 10:45:18 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-20 10:45:18 -0800 |
| commit | 53903d9eb1e50a98ff5fae305a1f74fc9ae73143 (patch) | |
| tree | c984fc364a58576cb735edb231cf5dc6ffb66482 | |
| parent | f0e75484a7a4fc5646f7fed6cfb736a009526f59 (diff) | |
| download | samba-53903d9eb1e50a98ff5fae305a1f74fc9ae73143.tar.gz samba-53903d9eb1e50a98ff5fae305a1f74fc9ae73143.tar.bz2 samba-53903d9eb1e50a98ff5fae305a1f74fc9ae73143.zip | |
Fix the build, by some cut-and-paste error I got two versions of the same functions here.
Jeremy.
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index c28ba839be..2edb441741 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} }; |