diff options
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 40 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_tdb.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 4 |
3 files changed, 49 insertions, 1 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index b3e9973fda..827c954b1d 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -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; +} diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 7a9e10d4be..17cf493bf8 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -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 }; diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index 213ba9ae51..90959f322e 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -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 }; |