From c70ac29c5441073752da7384b7f3bf54c9986aa0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 4 Apr 2012 08:34:25 +1000 Subject: s3-vfs: Remove unused lsetxattr call from VFS modules, system.c and configure If this is ever needed again, it would be more appropriate as an options argument to listxattr. Andrew Bartlett --- source3/include/proto.h | 1 - source3/include/vfs.h | 3 +-- source3/include/vfs_macros.h | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 5bfd05cb53..b4b91e2b18 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -358,7 +358,6 @@ int sys_removexattr (const char *path, const char *name); int sys_lremovexattr (const char *path, const char *name); int sys_fremovexattr (int filedes, const char *name); int sys_setxattr (const char *path, const char *name, const void *value, size_t size, int flags); -int sys_lsetxattr (const char *path, const char *name, const void *value, size_t size, int flags); int sys_fsetxattr (int filedes, const char *name, const void *value, size_t size, int flags); uint32 unix_dev_major(SMB_DEV_T dev); uint32 unix_dev_minor(SMB_DEV_T dev); diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 258bec9275..0e42a3e812 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -138,7 +138,7 @@ /* Bump to version 29 - Samba 3.6.0 will ship with interface version 28. */ /* Leave at 29 - not yet releases. Add fsctl. Richard Sharpe */ /* Leave at 29 - not yet released. add SMB_VFS_GET_DFS_REFERRAL() - metze */ -/* Leave at 29 - not yet released. Remove llistxattr and lgetxattr - abartlet */ +/* Leave at 29 - not yet released. Remove l{list,get,set,remove}xattr - abartlet */ #define SMB_VFS_INTERFACE_VERSION 29 /* @@ -406,7 +406,6 @@ struct vfs_fn_pointers { int (*lremovexattr_fn)(struct vfs_handle_struct *handle, const char *path, const char *name); int (*fremovexattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name); int (*setxattr_fn)(struct vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags); - int (*lsetxattr_fn)(struct vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags); int (*fsetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags); /* aio operations */ diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 6af662c1f4..e568ed0f49 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -554,11 +554,6 @@ #define SMB_VFS_NEXT_SETXATTR(handle,path,name,value,size,flags) \ smb_vfs_call_setxattr((handle)->next,(path),(name),(value),(size),(flags)) -#define SMB_VFS_LSETXATTR(conn,path,name,value,size,flags) \ - smb_vfs_call_lsetxattr((conn)->vfs_handles,(path),(name),(value),(size),(flags)) -#define SMB_VFS_NEXT_LSETXATTR(handle,path,name,value,size,flags) \ - smb_vfs_call_lsetxattr((handle)->next,(path),(name),(value),(size),(flags)) - #define SMB_VFS_FSETXATTR(fsp,name,value,size,flags) \ smb_vfs_call_fsetxattr((fsp)->conn->vfs_handles, (fsp), (name),(value),(size),(flags)) #define SMB_VFS_NEXT_FSETXATTR(handle,fsp,name,value,size,flags) \ -- cgit