diff options
Diffstat (limited to 'source3/modules')
-rw-r--r-- | source3/modules/vfs_cap.c | 13 | ||||
-rw-r--r-- | source3/modules/vfs_catia.c | 24 | ||||
-rw-r--r-- | source3/modules/vfs_default.c | 6 | ||||
-rw-r--r-- | source3/modules/vfs_full_audit.c | 19 | ||||
-rw-r--r-- | source3/modules/vfs_onefs_shadow_copy.c | 10 | ||||
-rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 32 | ||||
-rw-r--r-- | source3/modules/vfs_time_audit.c | 23 |
7 files changed, 0 insertions, 127 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 125b5f43da..406126cade 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -523,18 +523,6 @@ static int cap_setxattr(vfs_handle_struct *handle, const char *path, const char return SMB_VFS_NEXT_SETXATTR(handle, cappath, capname, value, size, flags); } -static int cap_lsetxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags) -{ - char *cappath = capencode(talloc_tos(), path); - char *capname = capencode(talloc_tos(), name); - - if (!cappath || !capname) { - errno = ENOMEM; - return -1; - } - return SMB_VFS_NEXT_LSETXATTR(handle, cappath, capname, value, size, flags); -} - static int cap_fsetxattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *path, const void *value, size_t size, int flags) { char *cappath = capencode(talloc_tos(), path); @@ -578,7 +566,6 @@ static struct vfs_fn_pointers vfs_cap_fns = { .lremovexattr_fn = cap_lremovexattr, .fremovexattr_fn = cap_fremovexattr, .setxattr_fn = cap_setxattr, - .lsetxattr_fn = cap_lsetxattr, .fsetxattr_fn = cap_fsetxattr }; diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 687547dc17..6979dc6c8d 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -919,29 +919,6 @@ catia_setxattr(vfs_handle_struct *handle, const char *path, return ret; } -static int -catia_lsetxattr(vfs_handle_struct *handle, const char *path, - const char *name, const void *value, size_t size, - int flags) -{ - char *mapped_name = NULL; - NTSTATUS status; - ssize_t ret; - - status = catia_string_replace_allocate(handle->conn, - name, &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_LSETXATTR(handle, path, mapped_name, value, size, flags); - TALLOC_FREE(mapped_name); - - return ret; -} - static struct vfs_fn_pointers vfs_catia_fns = { .mkdir_fn = catia_mkdir, .rmdir_fn = catia_rmdir, @@ -969,7 +946,6 @@ static struct vfs_fn_pointers vfs_catia_fns = { .removexattr_fn = catia_removexattr, .lremovexattr_fn = catia_lremovexattr, .setxattr_fn = catia_setxattr, - .lsetxattr_fn = catia_lsetxattr, }; NTSTATUS vfs_catia_init(void) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index a7abe0ba42..08ad80f8d3 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2043,11 +2043,6 @@ static int vfswrap_setxattr(struct vfs_handle_struct *handle, const char *path, return sys_setxattr(path, name, value, size, flags); } -static int vfswrap_lsetxattr(struct vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags) -{ - return sys_lsetxattr(path, name, value, size, flags); -} - static int vfswrap_fsetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags) { return sys_fsetxattr(fsp->fh->fd, name, value, size, flags); @@ -2276,7 +2271,6 @@ static struct vfs_fn_pointers vfs_default_fns = { .lremovexattr_fn = vfswrap_lremovexattr, .fremovexattr_fn = vfswrap_fremovexattr, .setxattr_fn = vfswrap_setxattr, - .lsetxattr_fn = vfswrap_lsetxattr, .fsetxattr_fn = vfswrap_fsetxattr, /* aio operations */ diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 8c7e0f36cc..73e41ed265 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -198,7 +198,6 @@ typedef enum _vfs_op_type { SMB_VFS_OP_LREMOVEXATTR, SMB_VFS_OP_FREMOVEXATTR, SMB_VFS_OP_SETXATTR, - SMB_VFS_OP_LSETXATTR, SMB_VFS_OP_FSETXATTR, /* aio operations */ @@ -327,7 +326,6 @@ static struct { { SMB_VFS_OP_LREMOVEXATTR, "lremovexattr" }, { SMB_VFS_OP_FREMOVEXATTR, "fremovexattr" }, { SMB_VFS_OP_SETXATTR, "setxattr" }, - { SMB_VFS_OP_LSETXATTR, "lsetxattr" }, { SMB_VFS_OP_FSETXATTR, "fsetxattr" }, { SMB_VFS_OP_AIO_READ, "aio_read" }, { SMB_VFS_OP_AIO_WRITE, "aio_write" }, @@ -2068,22 +2066,6 @@ static int smb_full_audit_setxattr(struct vfs_handle_struct *handle, return result; } -static int smb_full_audit_lsetxattr(struct vfs_handle_struct *handle, - const char *path, - const char *name, const void *value, size_t size, - int flags) -{ - int result; - - result = SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size, - flags); - - do_log(SMB_VFS_OP_LSETXATTR, (result >= 0), handle, - "%s|%s", path, name); - - return result; -} - static int smb_full_audit_fsetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags) @@ -2315,7 +2297,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .lremovexattr_fn = smb_full_audit_lremovexattr, .fremovexattr_fn = smb_full_audit_fremovexattr, .setxattr_fn = smb_full_audit_setxattr, - .lsetxattr_fn = smb_full_audit_lsetxattr, .fsetxattr_fn = smb_full_audit_fsetxattr, .aio_read_fn = smb_full_audit_aio_read, .aio_write_fn = smb_full_audit_aio_write, diff --git a/source3/modules/vfs_onefs_shadow_copy.c b/source3/modules/vfs_onefs_shadow_copy.c index 410859a046..531f9b4b83 100644 --- a/source3/modules/vfs_onefs_shadow_copy.c +++ b/source3/modules/vfs_onefs_shadow_copy.c @@ -605,16 +605,6 @@ onefs_shadow_copy_setxattr(vfs_handle_struct *handle, const char *path, int); } -static int -onefs_shadow_copy_lsetxattr(vfs_handle_struct *handle, const char *path, - const char *name, const void *value, size_t size, - int flags) -{ - SHADOW_NEXT(LSETXATTR, - (handle, cpath ?: path, name, value, size, flags), - int); -} - static bool onefs_shadow_copy_is_offline(struct vfs_handle_struct *handle, const struct smb_fname *fname, diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 441a68a30c..544baa44f7 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -1435,37 +1435,6 @@ static int shadow_copy2_setxattr(struct vfs_handle_struct *handle, return ret; } -static int shadow_copy2_lsetxattr(struct vfs_handle_struct *handle, - const char *fname, - const char *aname, const void *value, - size_t size, int flags) -{ - time_t timestamp; - char *stripped; - ssize_t ret; - int saved_errno; - char *conv; - - if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, fname, - ×tamp, &stripped)) { - return -1; - } - if (timestamp == 0) { - return SMB_VFS_NEXT_LSETXATTR(handle, fname, aname, value, - size, flags); - } - conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp); - TALLOC_FREE(stripped); - if (conv == NULL) { - return -1; - } - ret = SMB_VFS_NEXT_LSETXATTR(handle, conv, aname, value, size, flags); - saved_errno = errno; - TALLOC_FREE(conv); - errno = saved_errno; - return ret; -} - static int shadow_copy2_chmod_acl(vfs_handle_struct *handle, const char *fname, mode_t mode) { @@ -1563,7 +1532,6 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = { .removexattr_fn = shadow_copy2_removexattr, .lremovexattr_fn = shadow_copy2_lremovexattr, .setxattr_fn = shadow_copy2_setxattr, - .lsetxattr_fn = shadow_copy2_lsetxattr, .chmod_acl_fn = shadow_copy2_chmod_acl, .chflags_fn = shadow_copy2_chflags, .get_real_filename_fn = shadow_copy2_get_real_filename, diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index 4064bccfbc..747fc79bd2 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -2093,28 +2093,6 @@ static int smb_time_audit_setxattr(struct vfs_handle_struct *handle, return result; } -static int smb_time_audit_lsetxattr(struct vfs_handle_struct *handle, - const char *path, const char *name, - const void *value, size_t size, - int flags) -{ - int result; - struct timespec ts1,ts2; - double timediff; - - clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_LSETXATTR(handle, path, name, value, size, - flags); - clock_gettime_mono(&ts2); - timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; - - if (timediff > audit_timeout) { - smb_time_audit_log("lsetxattr", timediff); - } - - return result; -} - static int smb_time_audit_fsetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags) @@ -2401,7 +2379,6 @@ static struct vfs_fn_pointers vfs_time_audit_fns = { .lremovexattr_fn = smb_time_audit_lremovexattr, .fremovexattr_fn = smb_time_audit_fremovexattr, .setxattr_fn = smb_time_audit_setxattr, - .lsetxattr_fn = smb_time_audit_lsetxattr, .fsetxattr_fn = smb_time_audit_fsetxattr, .aio_read_fn = smb_time_audit_aio_read, .aio_write_fn = smb_time_audit_aio_write, |