diff options
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/vfs.h | 59 | ||||
-rw-r--r-- | source3/include/vfs_macros.h | 85 |
2 files changed, 1 insertions, 143 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index c5b896db0f..f2cfd24cd3 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -140,6 +140,7 @@ /* Leave at 29 - not yet released. add SMB_VFS_GET_DFS_REFERRAL() - metze */ /* Leave at 29 - not yet released. Remove l{list,get,set,remove}xattr - abartlet */ /* Leave at 29 - not yet released. move to plain off_t - abartlet */ +/* Leave at 29 - not yet released. Remove sys_acl functions other than set and get - abartlet */ #define SMB_VFS_INTERFACE_VERSION 29 /* @@ -683,28 +684,11 @@ struct vfs_fn_pointers { int (*chmod_acl_fn)(struct vfs_handle_struct *handle, const char *name, mode_t mode); int (*fchmod_acl_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode); - int (*sys_acl_get_entry_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p); - int (*sys_acl_get_tag_type_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); - int (*sys_acl_get_permset_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p); - void * (*sys_acl_get_qualifier_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry_d); SMB_ACL_T (*sys_acl_get_file_fn)(struct vfs_handle_struct *handle, const char *path_p, SMB_ACL_TYPE_T type); SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp); - int (*sys_acl_clear_perms_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset); - int (*sys_acl_add_perm_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); - char * (*sys_acl_to_text_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl, ssize_t *plen); - SMB_ACL_T (*sys_acl_init_fn)(struct vfs_handle_struct *handle, int count); - int (*sys_acl_create_entry_fn)(struct vfs_handle_struct *handle, SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); - int (*sys_acl_set_tag_type_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); - int (*sys_acl_set_qualifier_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, void *qual); - int (*sys_acl_set_permset_fn)(struct vfs_handle_struct *handle, SMB_ACL_ENTRY_T entry, SMB_ACL_PERMSET_T permset); - int (*sys_acl_valid_fn)(struct vfs_handle_struct *handle, SMB_ACL_T theacl ); int (*sys_acl_set_file_fn)(struct vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); int (*sys_acl_set_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T theacl); int (*sys_acl_delete_def_file_fn)(struct vfs_handle_struct *handle, const char *path); - int (*sys_acl_get_perm_fn)(struct vfs_handle_struct *handle, SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm); - int (*sys_acl_free_text_fn)(struct vfs_handle_struct *handle, char *text); - int (*sys_acl_free_acl_fn)(struct vfs_handle_struct *handle, SMB_ACL_T posix_acl); - int (*sys_acl_free_qualifier_fn)(struct vfs_handle_struct *handle, void *qualifier, SMB_ACL_TAG_T tagtype); /* EA operations. */ ssize_t (*getxattr_fn)(struct vfs_handle_struct *handle,const char *path, const char *name, void *value, size_t size); @@ -1076,43 +1060,11 @@ int smb_vfs_call_chmod_acl(struct vfs_handle_struct *handle, const char *name, mode_t mode); int smb_vfs_call_fchmod_acl(struct vfs_handle_struct *handle, struct files_struct *fsp, mode_t mode); -int smb_vfs_call_sys_acl_get_entry(struct vfs_handle_struct *handle, - SMB_ACL_T theacl, int entry_id, - SMB_ACL_ENTRY_T *entry_p); -int smb_vfs_call_sys_acl_get_tag_type(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry_d, - SMB_ACL_TAG_T *tag_type_p); -int smb_vfs_call_sys_acl_get_permset(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry_d, - SMB_ACL_PERMSET_T *permset_p); -void * smb_vfs_call_sys_acl_get_qualifier(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry_d); SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle, const char *path_p, SMB_ACL_TYPE_T type); SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp); -int smb_vfs_call_sys_acl_clear_perms(struct vfs_handle_struct *handle, - SMB_ACL_PERMSET_T permset); -int smb_vfs_call_sys_acl_add_perm(struct vfs_handle_struct *handle, - SMB_ACL_PERMSET_T permset, - SMB_ACL_PERM_T perm); -char * smb_vfs_call_sys_acl_to_text(struct vfs_handle_struct *handle, - SMB_ACL_T theacl, ssize_t *plen); -SMB_ACL_T smb_vfs_call_sys_acl_init(struct vfs_handle_struct *handle, - int count); -int smb_vfs_call_sys_acl_create_entry(struct vfs_handle_struct *handle, - SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -int smb_vfs_call_sys_acl_set_tag_type(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry, - SMB_ACL_TAG_T tagtype); -int smb_vfs_call_sys_acl_set_qualifier(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry, void *qual); -int smb_vfs_call_sys_acl_set_permset(struct vfs_handle_struct *handle, - SMB_ACL_ENTRY_T entry, - SMB_ACL_PERMSET_T permset); -int smb_vfs_call_sys_acl_valid(struct vfs_handle_struct *handle, - SMB_ACL_T theacl); int smb_vfs_call_sys_acl_set_file(struct vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); @@ -1120,15 +1072,6 @@ int smb_vfs_call_sys_acl_set_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T theacl); int smb_vfs_call_sys_acl_delete_def_file(struct vfs_handle_struct *handle, const char *path); -int smb_vfs_call_sys_acl_get_perm(struct vfs_handle_struct *handle, - SMB_ACL_PERMSET_T permset, - SMB_ACL_PERM_T perm); -int smb_vfs_call_sys_acl_free_text(struct vfs_handle_struct *handle, - char *text); -int smb_vfs_call_sys_acl_free_acl(struct vfs_handle_struct *handle, - SMB_ACL_T posix_acl); -int smb_vfs_call_sys_acl_free_qualifier(struct vfs_handle_struct *handle, - void *qualifier, SMB_ACL_TAG_T tagtype); ssize_t smb_vfs_call_getxattr(struct vfs_handle_struct *handle, const char *path, const char *name, void *value, size_t size); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 515f68f16e..e577e9950f 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -429,26 +429,6 @@ #define SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode) \ smb_vfs_call_fchmod_acl((handle)->next, (fsp), (mode)) -#define SMB_VFS_SYS_ACL_GET_ENTRY(conn, theacl, entry_id, entry_p) \ - smb_vfs_call_sys_acl_get_entry((conn)->vfs_handles, (theacl), (entry_id), (entry_p)) -#define SMB_VFS_NEXT_SYS_ACL_GET_ENTRY(handle, theacl, entry_id, entry_p) \ - smb_vfs_call_sys_acl_get_entry((handle)->next, (theacl), (entry_id), (entry_p)) - -#define SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry_d, tag_type_p) \ - smb_vfs_call_sys_acl_get_tag_type((conn)->vfs_handles, (entry_d), (tag_type_p)) -#define SMB_VFS_NEXT_SYS_ACL_GET_TAG_TYPE(handle, entry_d, tag_type_p) \ - smb_vfs_call_sys_acl_get_tag_type((handle)->next, (entry_d), (tag_type_p)) - -#define SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry_d, permset_p) \ - smb_vfs_call_sys_acl_get_permset((conn)->vfs_handles, (entry_d), (permset_p)) -#define SMB_VFS_NEXT_SYS_ACL_GET_PERMSET(handle, entry_d, permset_p) \ - smb_vfs_call_sys_acl_get_permset((handle)->next, (entry_d), (permset_p)) - -#define SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry_d) \ - smb_vfs_call_sys_acl_get_qualifier((conn)->vfs_handles, (entry_d)) -#define SMB_VFS_NEXT_SYS_ACL_GET_QUALIFIER(handle, entry_d) \ - smb_vfs_call_sys_acl_get_qualifier((handle)->next, (entry_d)) - #define SMB_VFS_SYS_ACL_GET_FILE(conn, path_p, type) \ smb_vfs_call_sys_acl_get_file((conn)->vfs_handles, (path_p), (type)) #define SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type) \ @@ -459,51 +439,6 @@ #define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp) \ smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp)) -#define SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, permset) \ - smb_vfs_call_sys_acl_clear_perms((conn)->vfs_handles, (permset)) -#define SMB_VFS_NEXT_SYS_ACL_CLEAR_PERMS(handle, permset) \ - smb_vfs_call_sys_acl_clear_perms((handle)->next, (permset)) - -#define SMB_VFS_SYS_ACL_ADD_PERM(conn, permset, perm) \ - smb_vfs_call_sys_acl_add_perm((conn)->vfs_handles, (permset), (perm)) -#define SMB_VFS_NEXT_SYS_ACL_ADD_PERM(handle, permset, perm) \ - smb_vfs_call_sys_acl_add_perm((handle)->next, (permset), (perm)) - -#define SMB_VFS_SYS_ACL_TO_TEXT(conn, theacl, plen) \ - smb_vfs_call_sys_acl_to_text((conn)->vfs_handles, (theacl), (plen)) -#define SMB_VFS_NEXT_SYS_ACL_TO_TEXT(handle, theacl, plen) \ - smb_vfs_call_sys_acl_to_text((handle)->next, (theacl), (plen)) - -#define SMB_VFS_SYS_ACL_INIT(conn, count) \ - smb_vfs_call_sys_acl_init((conn)->vfs_handles, (count)) -#define SMB_VFS_NEXT_SYS_ACL_INIT(handle, count) \ - smb_vfs_call_sys_acl_init((handle)->next, (count)) - -#define SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, pacl, pentry) \ - smb_vfs_call_sys_acl_create_entry((conn)->vfs_handles, (pacl), (pentry)) -#define SMB_VFS_NEXT_SYS_ACL_CREATE_ENTRY(handle, pacl, pentry) \ - smb_vfs_call_sys_acl_create_entry((handle)->next, (pacl), (pentry)) - -#define SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, entry, tagtype) \ - smb_vfs_call_sys_acl_set_tag_type((conn)->vfs_handles, (entry), (tagtype)) -#define SMB_VFS_NEXT_SYS_ACL_SET_TAG_TYPE(handle, entry, tagtype) \ - smb_vfs_call_sys_acl_set_tag_type((handle)->next, (entry), (tagtype)) - -#define SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, entry, qual) \ - smb_vfs_call_sys_acl_set_qualifier((conn)->vfs_handles, (entry), (qual)) -#define SMB_VFS_NEXT_SYS_ACL_SET_QUALIFIER(handle, entry, qual) \ - smb_vfs_call_sys_acl_set_qualifier((handle)->next, (entry), (qual)) - -#define SMB_VFS_SYS_ACL_SET_PERMSET(conn, entry, permset) \ - smb_vfs_call_sys_acl_set_permset((conn)->vfs_handles, (entry), (permset)) -#define SMB_VFS_NEXT_SYS_ACL_SET_PERMSET(handle, entry, permset) \ - smb_vfs_call_sys_acl_set_permset((handle)->next, (entry), (permset)) - -#define SMB_VFS_SYS_ACL_VALID(conn, theacl) \ - smb_vfs_call_sys_acl_valid((conn)->vfs_handles, (theacl)) -#define SMB_VFS_NEXT_SYS_ACL_VALID(handle, theacl) \ - smb_vfs_call_sys_acl_valid((handle)->next, (theacl)) - #define SMB_VFS_SYS_ACL_SET_FILE(conn, name, acltype, theacl) \ smb_vfs_call_sys_acl_set_file((conn)->vfs_handles, (name), (acltype), (theacl)) #define SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, name, acltype, theacl) \ @@ -519,26 +454,6 @@ #define SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, path) \ smb_vfs_call_sys_acl_delete_def_file((handle)->next, (path)) -#define SMB_VFS_SYS_ACL_GET_PERM(conn, permset, perm) \ - smb_vfs_call_sys_acl_get_perm((conn)->vfs_handles, (permset), (perm)) -#define SMB_VFS_NEXT_SYS_ACL_GET_PERM(handle, permset, perm) \ - smb_vfs_call_sys_acl_get_perm((handle)->next, (permset), (perm)) - -#define SMB_VFS_SYS_ACL_FREE_TEXT(conn, text) \ - smb_vfs_call_sys_acl_free_text((conn)->vfs_handles, (text)) -#define SMB_VFS_NEXT_SYS_ACL_FREE_TEXT(handle, text) \ - smb_vfs_call_sys_acl_free_text((handle)->next, (text)) - -#define SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl) \ - smb_vfs_call_sys_acl_free_acl((conn)->vfs_handles, (posix_acl)) -#define SMB_VFS_NEXT_SYS_ACL_FREE_ACL(handle, posix_acl) \ - smb_vfs_call_sys_acl_free_acl((handle)->next, (posix_acl)) - -#define SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, qualifier, tagtype) \ - smb_vfs_call_sys_acl_free_qualifier((conn)->vfs_handles, (qualifier), (tagtype)) -#define SMB_VFS_NEXT_SYS_ACL_FREE_QUALIFIER(handle, qualifier, tagtype) \ - smb_vfs_call_sys_acl_free_qualifier((handle)->next, (qualifier), (tagtype)) - #define SMB_VFS_GETXATTR(conn,path,name,value,size) \ smb_vfs_call_getxattr((conn)->vfs_handles,(path),(name),(value),(size)) #define SMB_VFS_NEXT_GETXATTR(handle,path,name,value,size) \ |