diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_cap.c | 12 | ||||
| -rw-r--r-- | source3/modules/vfs_catia.c | 23 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 15 | ||||
| -rw-r--r-- | source3/modules/vfs_onefs_shadow_copy.c | 10 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 21 |
6 files changed, 0 insertions, 87 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 716e5dce80..125b5f43da 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -476,17 +476,6 @@ static ssize_t cap_listxattr(vfs_handle_struct *handle, const char *path, char * return SMB_VFS_NEXT_LISTXATTR(handle, cappath, list, size); } -static ssize_t cap_llistxattr(vfs_handle_struct *handle, const char *path, char *list, size_t size) -{ - char *cappath = capencode(talloc_tos(), path); - - if (!cappath) { - errno = ENOMEM; - return -1; - } - return SMB_VFS_NEXT_LLISTXATTR(handle, cappath, list, size); -} - static int cap_removexattr(vfs_handle_struct *handle, const char *path, const char *name) { char *cappath = capencode(talloc_tos(), path); @@ -585,7 +574,6 @@ static struct vfs_fn_pointers vfs_cap_fns = { .getxattr_fn = cap_getxattr, .fgetxattr_fn = cap_fgetxattr, .listxattr_fn = cap_listxattr, - .llistxattr_fn = cap_llistxattr, .removexattr_fn = cap_removexattr, .lremovexattr_fn = cap_lremovexattr, .fremovexattr_fn = cap_fremovexattr, diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index c34edf7073..687547dc17 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -852,28 +852,6 @@ catia_listxattr(vfs_handle_struct *handle, const char *path, return ret; } -static ssize_t -catia_llistxattr(vfs_handle_struct *handle, const char *path, - char *list, size_t size) -{ - char *mapped_name = NULL; - NTSTATUS status; - ssize_t ret; - - status = catia_string_replace_allocate(handle->conn, - path, &mapped_name, vfs_translate_to_unix); - if (!NT_STATUS_IS_OK(status)) { - errno = map_errno_from_nt_status(status); - return -1; - } - - - ret = SMB_VFS_NEXT_LLISTXATTR(handle, mapped_name, list, size); - TALLOC_FREE(mapped_name); - - return ret; -} - static int catia_removexattr(vfs_handle_struct *handle, const char *path, const char *name) @@ -988,7 +966,6 @@ static struct vfs_fn_pointers vfs_catia_fns = { .sys_acl_delete_def_file_fn = catia_sys_acl_delete_def_file, .getxattr_fn = catia_getxattr, .listxattr_fn = catia_listxattr, - .llistxattr_fn = catia_llistxattr, .removexattr_fn = catia_removexattr, .lremovexattr_fn = catia_lremovexattr, .setxattr_fn = catia_setxattr, diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index ed1ee707e2..a7abe0ba42 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2018,11 +2018,6 @@ static ssize_t vfswrap_listxattr(struct vfs_handle_struct *handle, const char *p return sys_listxattr(path, list, size); } -static ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size) -{ - return sys_llistxattr(path, list, size); -} - static ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size) { return sys_flistxattr(fsp->fh->fd, list, size); @@ -2276,7 +2271,6 @@ static struct vfs_fn_pointers vfs_default_fns = { .getxattr_fn = vfswrap_getxattr, .fgetxattr_fn = vfswrap_fgetxattr, .listxattr_fn = vfswrap_listxattr, - .llistxattr_fn = vfswrap_llistxattr, .flistxattr_fn = vfswrap_flistxattr, .removexattr_fn = vfswrap_removexattr, .lremovexattr_fn = vfswrap_lremovexattr, diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index a35c210d2b..8c7e0f36cc 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -193,7 +193,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_GETXATTR, SMB_VFS_OP_FGETXATTR, SMB_VFS_OP_LISTXATTR, - SMB_VFS_OP_LLISTXATTR, SMB_VFS_OP_FLISTXATTR, SMB_VFS_OP_REMOVEXATTR, SMB_VFS_OP_LREMOVEXATTR, @@ -323,7 +322,6 @@ static struct { { SMB_VFS_OP_GETXATTR, "getxattr" }, { SMB_VFS_OP_FGETXATTR, "fgetxattr" }, { SMB_VFS_OP_LISTXATTR, "listxattr" }, - { SMB_VFS_OP_LLISTXATTR, "llistxattr" }, { SMB_VFS_OP_FLISTXATTR, "flistxattr" }, { SMB_VFS_OP_REMOVEXATTR, "removexattr" }, { SMB_VFS_OP_LREMOVEXATTR, "lremovexattr" }, @@ -1998,18 +1996,6 @@ static ssize_t smb_full_audit_listxattr(struct vfs_handle_struct *handle, return result; } -static ssize_t smb_full_audit_llistxattr(struct vfs_handle_struct *handle, - const char *path, char *list, size_t size) -{ - ssize_t result; - - result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size); - - do_log(SMB_VFS_OP_LLISTXATTR, (result >= 0), handle, "%s", path); - - return result; -} - static ssize_t smb_full_audit_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size) @@ -2324,7 +2310,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .getxattr_fn = smb_full_audit_getxattr, .fgetxattr_fn = smb_full_audit_fgetxattr, .listxattr_fn = smb_full_audit_listxattr, - .llistxattr_fn = smb_full_audit_llistxattr, .flistxattr_fn = smb_full_audit_flistxattr, .removexattr_fn = smb_full_audit_removexattr, .lremovexattr_fn = smb_full_audit_lremovexattr, diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c index 09df2f8f3e..410859a046 100644 --- a/source3/modules/vfs_onefs_shadow_copy.c +++ b/source3/modules/vfs_onefs_shadow_copy.c @@ -577,15 +577,6 @@ onefs_shadow_copy_listxattr(vfs_handle_struct *handle, const char *path, ssize_t); } -static ssize_t -onefs_shadow_copy_llistxattr(vfs_handle_struct *handle, const char *path, - char *list, size_t size) -{ - SHADOW_NEXT(LLISTXATTR, - (handle, cpath ?: path, list, size), - ssize_t); -} - static int onefs_shadow_copy_removexattr(vfs_handle_struct *handle, const char *path, const char *name) @@ -681,7 +672,6 @@ static struct vfs_fn_pointers onefs_shadow_copy_fns = { .sys_acl_delete_def_file_fn = onefs_shadow_copy_sys_acl_delete_def_file, .getxattr_fn = onefs_shadow_copy_getxattr, .listxattr_fn = onefs_shadow_copy_listxattr, - .llistxattr_fn = onefs_shadow_copy_llistxattr, .removexattr_fn = onefs_shadow_copy_removexattr, .lremovexattr_fn = onefs_shadow_copy_lremovexattr, .setxattr_fn = onefs_shadow_copy_setxattr, diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 8d7c7439f2..4064bccfbc 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -1993,26 +1993,6 @@ static ssize_t smb_time_audit_listxattr(struct vfs_handle_struct *handle, return result; } -static ssize_t smb_time_audit_llistxattr(struct vfs_handle_struct *handle, - const char *path, char *list, - size_t size) -{ - ssize_t result; - struct timespec ts1,ts2; - double timediff; - - clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_LLISTXATTR(handle, path, list, size); - clock_gettime_mono(&ts2); - timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; - - if (timediff > audit_timeout) { - smb_time_audit_log("llistxattr", timediff); - } - - return result; -} - static ssize_t smb_time_audit_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size) @@ -2416,7 +2396,6 @@ static struct vfs_fn_pointers vfs_time_audit_fns = { .getxattr_fn = smb_time_audit_getxattr, .fgetxattr_fn = smb_time_audit_fgetxattr, .listxattr_fn = smb_time_audit_listxattr, - .llistxattr_fn = smb_time_audit_llistxattr, .flistxattr_fn = smb_time_audit_flistxattr, .removexattr_fn = smb_time_audit_removexattr, .lremovexattr_fn = smb_time_audit_lremovexattr, |