diff options
| author | Jeremy Allison <jra@samba.org> | 2017-05-23 17:11:18 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-05-31 22:50:22 +0200 |
| commit | cea8e57eac2ed7b90a5c5d207bf392ff0546398e (patch) | |
| tree | 39c914e82dc601b027f7f97c5f877f30a37d15f2 /source3/modules/vfs_cap.c | |
| parent | 85c8780581e0f2bb0fdb940a865857db68111fbd (diff) | |
| download | samba-cea8e57eac2ed7b90a5c5d207bf392ff0546398e.tar.gz | |
s3: VFS: Change SMB_VFS_SYS_ACL_GET_FILE to use const struct smb_filename * instead of const char *.
We need to migrate all pathname based VFS calls to use a struct
to finish modernising the VFS with extra timestamp and flags parameters.
Requires a few extra cleanups in calling code.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/modules/vfs_cap.c')
| -rw-r--r-- | source3/modules/vfs_cap.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 41799262675..8aba4314fcb 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -545,16 +545,40 @@ static int cap_chmod_acl(vfs_handle_struct *handle, } static SMB_ACL_T cap_sys_acl_get_file(vfs_handle_struct *handle, - const char *path, SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) + const struct smb_filename *smb_fname, + SMB_ACL_TYPE_T type, + TALLOC_CTX *mem_ctx) { - char *cappath = capencode(talloc_tos(), path); + struct smb_filename *cap_smb_fname = NULL; + char *cappath = capencode(talloc_tos(), smb_fname->base_name); + SMB_ACL_T ret; + int saved_errno = 0; if (!cappath) { errno = ENOMEM; return (SMB_ACL_T)NULL; } - return SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, cappath, type, mem_ctx); + cap_smb_fname = synthetic_smb_fname(talloc_tos(), + cappath, + NULL, + NULL, + smb_fname->flags); + if (cap_smb_fname == NULL) { + TALLOC_FREE(cappath); + errno = ENOMEM; + return (SMB_ACL_T)NULL; + } + ret = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, cap_smb_fname, + type, mem_ctx); + if (ret == NULL) { + saved_errno = errno; + } + TALLOC_FREE(cappath); + TALLOC_FREE(cap_smb_fname); + if (saved_errno != 0) { + errno = saved_errno; + } + return ret; } static int cap_sys_acl_set_file(vfs_handle_struct *handle, const char *path, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl) |