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

VFS: Add initial implemenataion for SMB_VFS_FCHFLAGS

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Noel Power
2021-06-10 16:31:40 +01:00
committed by Noel Power
parent 5f70396e62
commit 9ca41e197f
10 changed files with 128 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/VFS/skel_opaque.c
View File

@ -514,6 +514,14 @@ static int skel_chflags(vfs_handle_struct *handle,
return -1;
}
static int skel_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
uint flags)
{
errno = ENOSYS;
return -1;
}
static struct file_id skel_file_id_create(vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -1029,6 +1037,7 @@ static struct vfs_fn_pointers skel_opaque_fns = {
.mknodat_fn = skel_mknodat,
.realpath_fn = skel_realpath,
.chflags_fn = skel_chflags,
.fchflags_fn = skel_fchflags,
.file_id_create_fn = skel_file_id_create,
.fs_file_id_fn = skel_fs_file_id,
.offload_read_send_fn = skel_offload_read_send,

8
examples/VFS/skel_transparent.c
View File

@ -649,6 +649,13 @@ static int skel_chflags(vfs_handle_struct *handle,
return SMB_VFS_NEXT_CHFLAGS(handle, smb_fname, flags);
}
static int skel_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
uint flags)
{
return SMB_VFS_NEXT_FCHFLAGS(handle, fsp, flags);
}
static struct file_id skel_file_id_create(vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -1334,6 +1341,7 @@ static struct vfs_fn_pointers skel_transparent_fns = {
.mknodat_fn = skel_mknodat,
.realpath_fn = skel_realpath,
.chflags_fn = skel_chflags,
.fchflags_fn = skel_fchflags,
.file_id_create_fn = skel_file_id_create,
.fs_file_id_fn = skel_fs_file_id,
.offload_read_send_fn = skel_offload_read_send,

10
source3/include/vfs.h
View File

@ -358,6 +358,7 @@
* Version 45 - Remove SMB_VFS_GET_NT_ACL_AT
* Version 45 - Remove SYS_ACL_GET_FILE
* Version 45 - Remove SYS_ACL_BLOB_GET_FILE
* Version 45 - Add SMB_VFS_FCHFLAGS
*/
#define SMB_VFS_INTERFACE_VERSION 45
@ -1069,6 +1070,9 @@ struct vfs_fn_pointers {
int (*chflags_fn)(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
unsigned int flags);
int (*fchflags_fn)(struct vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags);
struct file_id (*file_id_create_fn)(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf);
uint64_t (*fs_file_id_fn)(struct vfs_handle_struct *handle,
@ -1582,6 +1586,9 @@ struct smb_filename *smb_vfs_call_realpath(struct vfs_handle_struct *handle,
int smb_vfs_call_chflags(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
unsigned int flags);
int smb_vfs_call_fchflags(struct vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags);
struct file_id smb_vfs_call_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf);
uint64_t smb_vfs_call_fs_file_id(struct vfs_handle_struct *handle,
@ -2005,6 +2012,9 @@ struct smb_filename *vfs_not_implemented_realpath(vfs_handle_struct *handle,
int vfs_not_implemented_chflags(vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
uint flags);
int vfs_not_implemented_fchflags(vfs_handle_struct *handle,
struct files_struct *fst,
uint flags);
struct file_id vfs_not_implemented_file_id_create(vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf);
uint64_t vfs_not_implemented_fs_file_id(vfs_handle_struct *handle,

5
source3/include/vfs_macros.h
View File

@ -333,6 +333,11 @@
#define SMB_VFS_NEXT_CHFLAGS(handle, smb_fname, flags) \
smb_vfs_call_chflags((handle)->next, (smb_fname), (flags))
#define SMB_VFS_FCHFLAGS(fsp, flags) \
smb_vfs_call_fchflags((fsp)->conn->vfs_handles, (fsp), (flags))
#define SMB_VFS_NEXT_FCHFLAGS(handle, fsp, flags) \
smb_vfs_call_fchflags((handle)->next, (fsp), (flags))
#define SMB_VFS_FILE_ID_CREATE(conn, sbuf) \
smb_vfs_call_file_id_create((conn)->vfs_handles, (sbuf))
#define SMB_VFS_NEXT_FILE_ID_CREATE(handle, sbuf) \

34
source3/modules/vfs_default.c
View File

@ -3077,6 +3077,39 @@ static int vfswrap_chflags(vfs_handle_struct *handle,
#endif
}
static int vfswrap_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags)
{
#ifdef HAVE_FCHFLAGS
int fd = fsp_get_pathref_fd(fsp);
if (!fsp->fsp_flags.is_pathref) {
return fchflags(fd, flags);
}
if (fsp->fsp_flags.have_proc_fds) {
const char *p = NULL;
char buf[PATH_MAX];
p = sys_proc_fd_path(fd, buf, sizeof(buf));
if (p == NULL) {
return -1;
}
return chflags(p, flags);
}
/*
* This is no longer a handle based call.
*/
return chflags(fsp->fsp_name->base_name, flags);
#else
errno = ENOSYS;
return -1;
#endif
}
static struct file_id vfswrap_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -3848,6 +3881,7 @@ static struct vfs_fn_pointers vfs_default_fns = {
.mknodat_fn = vfswrap_mknodat,
.realpath_fn = vfswrap_realpath,
.chflags_fn = vfswrap_chflags,
.fchflags_fn = vfswrap_fchflags,
.file_id_create_fn = vfswrap_file_id_create,
.fs_file_id_fn = vfswrap_fs_file_id,
.fstreaminfo_fn = vfswrap_fstreaminfo,

20
source3/modules/vfs_full_audit.c
View File

@ -161,6 +161,7 @@ typedef enum _vfs_op_type {
SMB_VFS_OP_MKNODAT,
SMB_VFS_OP_REALPATH,
SMB_VFS_OP_CHFLAGS,
SMB_VFS_OP_FCHFLAGS,
SMB_VFS_OP_FILE_ID_CREATE,
SMB_VFS_OP_FS_FILE_ID,
SMB_VFS_OP_FSTREAMINFO,
@ -298,6 +299,7 @@ static struct {
{ SMB_VFS_OP_MKNODAT, "mknodat" },
{ SMB_VFS_OP_REALPATH, "realpath" },
{ SMB_VFS_OP_CHFLAGS, "chflags" },
{ SMB_VFS_OP_FCHFLAGS, "fchflags" },
{ SMB_VFS_OP_FILE_ID_CREATE, "file_id_create" },
{ SMB_VFS_OP_FS_FILE_ID, "fs_file_id" },
{ SMB_VFS_OP_FSTREAMINFO, "fstreaminfo" },
@ -1998,6 +2000,23 @@ static int smb_full_audit_chflags(vfs_handle_struct *handle,
return result;
}
static int smb_full_audit_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags)
{
int result;
result = SMB_VFS_NEXT_FCHFLAGS(handle, fsp, flags);
do_log(SMB_VFS_OP_FCHFLAGS,
(result != 0),
handle,
"%s",
smb_fname_str_do_log(handle->conn, fsp->fsp_name));
return result;
}
static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -2959,6 +2978,7 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
.mknodat_fn = smb_full_audit_mknodat,
.realpath_fn = smb_full_audit_realpath,
.chflags_fn = smb_full_audit_chflags,
.fchflags_fn = smb_full_audit_fchflags,
.file_id_create_fn = smb_full_audit_file_id_create,
.fs_file_id_fn = smb_full_audit_fs_file_id,
.offload_read_send_fn = smb_full_audit_offload_read_send,

9
source3/modules/vfs_not_implemented.c
View File

@ -512,6 +512,14 @@ int vfs_not_implemented_chflags(vfs_handle_struct *handle,
return -1;
}
int vfs_not_implemented_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
uint flags)
{
errno = ENOSYS;
return -1;
}
struct file_id vfs_not_implemented_file_id_create(vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -1033,6 +1041,7 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = {
.mknodat_fn = vfs_not_implemented_mknodat,
.realpath_fn = vfs_not_implemented_realpath,
.chflags_fn = vfs_not_implemented_chflags,
.fchflags_fn = vfs_not_implemented_fchflags,
.file_id_create_fn = vfs_not_implemented_file_id_create,
.fs_file_id_fn = vfs_not_implemented_fs_file_id,
.offload_read_send_fn = vfs_not_implemented_offload_read_send,

23
source3/modules/vfs_time_audit.c
View File

@ -1615,6 +1615,28 @@ static int smb_time_audit_chflags(vfs_handle_struct *handle,
return result;
}
static int smb_time_audit_fchflags(vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags)
{
int result;
struct timespec ts1,ts2;
double timediff;
clock_gettime_mono(&ts1);
result = SMB_VFS_NEXT_FCHFLAGS(handle, fsp, flags);
clock_gettime_mono(&ts2);
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
smb_time_audit_log_smb_fname("chflags",
timediff,
fsp->fsp_name);
}
return result;
}
static struct file_id smb_time_audit_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{
@ -2766,6 +2788,7 @@ static struct vfs_fn_pointers vfs_time_audit_fns = {
.mknodat_fn = smb_time_audit_mknodat,
.realpath_fn = smb_time_audit_realpath,
.chflags_fn = smb_time_audit_chflags,
.fchflags_fn = smb_time_audit_fchflags,
.file_id_create_fn = smb_time_audit_file_id_create,
.fs_file_id_fn = smb_time_audit_fs_file_id,
.offload_read_send_fn = smb_time_audit_offload_read_send,

8
source3/smbd/vfs.c
View File

@ -2386,6 +2386,14 @@ int smb_vfs_call_chflags(struct vfs_handle_struct *handle,
return handle->fns->chflags_fn(handle, smb_fname, flags);
}
int smb_vfs_call_fchflags(struct vfs_handle_struct *handle,
struct files_struct *fsp,
unsigned int flags)
{
VFS_FIND(fchflags);
return handle->fns->fchflags_fn(handle, fsp, flags);
}
struct file_id smb_vfs_call_file_id_create(struct vfs_handle_struct *handle,
const SMB_STRUCT_STAT *sbuf)
{

3
source3/wscript
View File

@ -124,7 +124,7 @@ def configure(conf):
conf.CHECK_HEADERS('linux/falloc.h linux/ioctl.h')
conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknodat')
conf.CHECK_FUNCS('strtol strchr strupr chflags')
conf.CHECK_FUNCS('strtol strchr strupr chflags fchflags')
conf.CHECK_FUNCS('getrlimit fsync setpgid')
conf.CHECK_FUNCS('setsid glob strpbrk crypt16 getauthuid')
conf.CHECK_FUNCS('innetgr')
@ -384,6 +384,7 @@ int main(int argc, char **argv) {
DNSServiceRegister
atexit
chflags
fchflags
chmod
crypt16
devnm