diff options
| author | Noel Power <noel.power@suse.com> | 2021-05-14 15:26:46 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2021-06-09 13:14:30 +0000 |
| commit | e59244461f477b01fe3110fcf5d73f2d9962bf4f (patch) | |
| tree | 3725f369fd17011c4a09cc986af1c88408fe68d8 /source3/include | |
| parent | 5504a5502d5146d38927f17bcda590e86c3427bc (diff) | |
| download | samba-e59244461f477b01fe3110fcf5d73f2d9962bf4f.tar.gz | |
VFS: SMB_VFS_SYS_ACL_GET_FD: Modify api to take additional type param
Modify all implementations (and the definitions) related to
SMB_VFS_SYS_ACL_GET_FD to accept additional SMB_ACL_TYPE_T type param.
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 6 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 0f01da81148..679aa871430 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -1220,6 +1220,7 @@ struct vfs_fn_pointers { TALLOC_CTX *mem_ctx); SMB_ACL_T (*sys_acl_get_fd_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, + SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx); int (*sys_acl_blob_get_file_fn)(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname, @@ -1731,6 +1732,7 @@ SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle, TALLOC_CTX *mem_ctx); SMB_ACL_T smb_vfs_call_sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, + SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx); int smb_vfs_call_sys_acl_blob_get_file(struct vfs_handle_struct *handle, const struct smb_filename *smb_fname, @@ -2142,7 +2144,9 @@ SMB_ACL_T vfs_not_implemented_sys_acl_get_file(vfs_handle_struct *handle, SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx); SMB_ACL_T vfs_not_implemented_sys_acl_get_fd(vfs_handle_struct *handle, - files_struct *fsp, TALLOC_CTX *mem_ctx); + files_struct *fsp, + SMB_ACL_TYPE_T type, + TALLOC_CTX *mem_ctx); int vfs_not_implemented_sys_acl_blob_get_file(vfs_handle_struct *handle, const struct smb_filename *smb_fname, TALLOC_CTX *mem_ctx, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 71492b4db79..be113932d57 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -494,10 +494,10 @@ #define SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, smb_fname, type, mem_ctx) \ smb_vfs_call_sys_acl_get_file((handle)->next, (smb_fname), (type), (mem_ctx)) -#define SMB_VFS_SYS_ACL_GET_FD(fsp, mem_ctx) \ - smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp), (mem_ctx)) -#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx) \ - smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (mem_ctx)) +#define SMB_VFS_SYS_ACL_GET_FD(fsp, type, mem_ctx) \ + smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp), (type), (mem_ctx)) +#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, type, mem_ctx) \ + smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (type), (mem_ctx)) #define SMB_VFS_SYS_ACL_BLOB_GET_FILE(conn, smb_fname, mem_ctx, blob_description, blob) \ smb_vfs_call_sys_acl_blob_get_file((conn)->vfs_handles, (smb_fname), (mem_ctx), (blob_description), (blob)) |