From 71b278d1626ef4c81ec8503c0a9435be77b10238 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 8 Jun 2021 16:16:32 -0700 Subject: s3: VFS: RIP SMB_VFS_SYS_ACL_BLOB_GET_FILE() (\ _ /) ( \ O / ) (// \\) X / \ /___\ _____/ \\_____ | + || | || | SMB_VFS_SYS_ACL || | BLOB_GET_FILE() || | || | || | || | _ ___ _ || | | \ | | \ || | | | | | | || | |_/ | |_/ || | | \ | | || | | \ | | || | | \. _|_. | . || | || * * | * ** * ** |** ** \)),.,\(/.,(//,,..,,\||(,,.,\\,.((// Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/modules/vfs_default.c | 1 - source3/modules/vfs_full_audit.c | 23 ----------------------- source3/modules/vfs_not_implemented.c | 11 ----------- source3/modules/vfs_time_audit.c | 25 ------------------------- 4 files changed, 60 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 17a54bfdcdf..109ad4bd696 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -3881,7 +3881,6 @@ static struct vfs_fn_pointers vfs_default_fns = { /* POSIX ACL operations. */ .sys_acl_get_fd_fn = vfswrap_sys_acl_get_fd, - .sys_acl_blob_get_file_fn = posix_sys_acl_blob_get_file, .sys_acl_blob_get_fd_fn = posix_sys_acl_blob_get_fd, .sys_acl_set_fd_fn = vfswrap_sys_acl_set_fd, .sys_acl_delete_def_fd_fn = vfswrap_sys_acl_delete_def_fd, diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 148d3e385d8..5e1963c025f 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -197,7 +197,6 @@ typedef enum _vfs_op_type { /* POSIX ACL operations. */ SMB_VFS_OP_SYS_ACL_GET_FD, - SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, SMB_VFS_OP_SYS_ACL_BLOB_GET_FD, SMB_VFS_OP_SYS_ACL_SET_FD, SMB_VFS_OP_SYS_ACL_DELETE_DEF_FD, @@ -327,7 +326,6 @@ static struct { { SMB_VFS_OP_FSET_NT_ACL, "fset_nt_acl" }, { SMB_VFS_OP_AUDIT_FILE, "audit_file" }, { SMB_VFS_OP_SYS_ACL_GET_FD, "sys_acl_get_fd" }, - { SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, "sys_acl_blob_get_file" }, { SMB_VFS_OP_SYS_ACL_BLOB_GET_FD, "sys_acl_blob_get_fd" }, { SMB_VFS_OP_SYS_ACL_SET_FD, "sys_acl_set_fd" }, { SMB_VFS_OP_SYS_ACL_DELETE_DEF_FD, "sys_acl_delete_def_fd" }, @@ -2540,26 +2538,6 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle, return result; } -static int smb_full_audit_sys_acl_blob_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - TALLOC_CTX *mem_ctx, - char **blob_description, - DATA_BLOB *blob) -{ - int result; - - result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname, - mem_ctx, blob_description, blob); - - do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, - (result >= 0), - handle, - "%s", - smb_fname_str_do_log(handle->conn, smb_fname)); - - return result; -} - static int smb_full_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, @@ -2981,7 +2959,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .fset_nt_acl_fn = smb_full_audit_fset_nt_acl, .audit_file_fn = smb_full_audit_audit_file, .sys_acl_get_fd_fn = smb_full_audit_sys_acl_get_fd, - .sys_acl_blob_get_file_fn = smb_full_audit_sys_acl_blob_get_file, .sys_acl_blob_get_fd_fn = smb_full_audit_sys_acl_blob_get_fd, .sys_acl_set_fd_fn = smb_full_audit_sys_acl_set_fd, .sys_acl_delete_def_fd_fn = smb_full_audit_sys_acl_delete_def_fd, diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c index 814131b6b2b..2dfac2338c6 100644 --- a/source3/modules/vfs_not_implemented.c +++ b/source3/modules/vfs_not_implemented.c @@ -801,16 +801,6 @@ SMB_ACL_T vfs_not_implemented_sys_acl_get_fd(vfs_handle_struct *handle, return (SMB_ACL_T) NULL; } -int vfs_not_implemented_sys_acl_blob_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - TALLOC_CTX *mem_ctx, - char **blob_description, - DATA_BLOB *blob) -{ - errno = ENOSYS; - return -1; -} - int vfs_not_implemented_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) @@ -1078,7 +1068,6 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = { /* POSIX ACL operations. */ .sys_acl_get_fd_fn = vfs_not_implemented_sys_acl_get_fd, - .sys_acl_blob_get_file_fn = vfs_not_implemented_sys_acl_blob_get_file, .sys_acl_blob_get_fd_fn = vfs_not_implemented_sys_acl_blob_get_fd, .sys_acl_set_fd_fn = vfs_not_implemented_sys_acl_set_fd, .sys_acl_delete_def_fd_fn = vfs_not_implemented_sys_acl_delete_def_fd, diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 16c79a0478c..1e7b5c1b65f 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -2337,30 +2337,6 @@ static SMB_ACL_T smb_time_audit_sys_acl_get_fd(vfs_handle_struct *handle, return result; } - -static int smb_time_audit_sys_acl_blob_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - TALLOC_CTX *mem_ctx, - char **blob_description, - DATA_BLOB *blob) -{ - int result; - struct timespec ts1,ts2; - double timediff; - - clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, smb_fname, - mem_ctx, blob_description, blob); - clock_gettime_mono(&ts2); - timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; - - if (timediff > audit_timeout) { - smb_time_audit_log("sys_acl_blob_get_file", timediff); - } - - return result; -} - static int smb_time_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, @@ -2807,7 +2783,6 @@ static struct vfs_fn_pointers vfs_time_audit_fns = { .fset_nt_acl_fn = smb_time_audit_fset_nt_acl, .audit_file_fn = smb_time_audit_audit_file, .sys_acl_get_fd_fn = smb_time_audit_sys_acl_get_fd, - .sys_acl_blob_get_file_fn = smb_time_audit_sys_acl_blob_get_file, .sys_acl_blob_get_fd_fn = smb_time_audit_sys_acl_blob_get_fd, .sys_acl_set_fd_fn = smb_time_audit_sys_acl_set_fd, .sys_acl_delete_def_fd_fn = smb_time_audit_sys_acl_delete_def_fd, -- cgit v1.2.1