sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Fix bug #7987 - ACL can get lost when files are being renamed.

Browse Source 
There is no reason for smbd with Windows ACLs to use chmod
or fchmod unless it's a file opened with UNIX extensions or
with posix pathnames.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Apr  2 02:40:43 CEST 2011 on sn-devel-104
This commit is contained in:
Jeremy Allison 2011-04-01 16:50:28 -07:00
parent ac216c130e
commit 00224d06c3
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source3/modules/vfs_acl_common.c
View File

@ -1020,3 +1020,43 @@ static int unlink_acl_common(struct vfs_handle_struct *handle,
smb_fname->base_name,
false);
}
static int chmod_acl_module_common(struct vfs_handle_struct *handle,
const char *path, mode_t mode)
{
if (lp_posix_pathnames()) {
/* Only allow this on POSIX pathnames. */
return SMB_VFS_NEXT_CHMOD(handle, path, mode);
}
return 0;
}
static int fchmod_acl_module_common(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode)
{
if (fsp->posix_open) {
/* Only allow this on POSIX opens. */
return SMB_VFS_NEXT_FCHMOD(handle, fsp, mode);
}
return 0;
}
static int chmod_acl_acl_module_common(struct vfs_handle_struct *handle,
const char *name, mode_t mode)
{
if (lp_posix_pathnames()) {
/* Only allow this on POSIX pathnames. */
return SMB_VFS_NEXT_CHMOD_ACL(handle, name, mode);
}
return 0;
}
static int fchmod_acl_acl_module_common(struct vfs_handle_struct *handle,
struct files_struct *fsp, mode_t mode)
{
if (fsp->posix_open) {
/* Only allow this on POSIX opens. */
return SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
}
return 0;
}

6
source3/modules/vfs_acl_tdb.c
View File

@ -401,13 +401,17 @@ static struct vfs_fn_pointers vfs_acl_tdb_fns = {
.disconnect = disconnect_acl_tdb,
.opendir = opendir_acl_common,
.mkdir = mkdir_acl_common,
.rmdir = rmdir_acl_tdb,
.open = open_acl_common,
.create_file = create_file_acl_common,
.unlink = unlink_acl_tdb,
.rmdir = rmdir_acl_tdb,
.chmod = chmod_acl_module_common,
.fchmod = fchmod_acl_module_common,
.fget_nt_acl = fget_nt_acl_common,
.get_nt_acl = get_nt_acl_common,
.fset_nt_acl = fset_nt_acl_common,
.chmod_acl = chmod_acl_acl_module_common,
.fchmod_acl = fchmod_acl_acl_module_common,
.sys_acl_set_file = sys_acl_set_file_tdb,
.sys_acl_set_fd = sys_acl_set_fd_tdb
};

4
source3/modules/vfs_acl_xattr.c
View File

@ -209,9 +209,13 @@ static struct vfs_fn_pointers vfs_acl_xattr_fns = {
.open = open_acl_common,
.create_file = create_file_acl_common,
.unlink = unlink_acl_common,
.chmod = chmod_acl_module_common,
.fchmod = fchmod_acl_module_common,
.fget_nt_acl = fget_nt_acl_common,
.get_nt_acl = get_nt_acl_common,
.fset_nt_acl = fset_nt_acl_common,
.chmod_acl = chmod_acl_acl_module_common,
.fchmod_acl = fchmod_acl_acl_module_common,
.sys_acl_set_file = sys_acl_set_file_xattr,
.sys_acl_set_fd = sys_acl_set_fd_xattr
};