From: Ralph Boehme Date: Mon, 16 Oct 2017 15:04:01 +0000 (+0200) Subject: vfs_nfs4acl_xattr: remove a layer of indirection X-Git-Tag: tevent-0.9.34~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=914dfe6ed48440c66692604f5b3216009a7e8f07;p=thirdparty%2Fsamba.git vfs_nfs4acl_xattr: remove a layer of indirection Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/source3/modules/vfs_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c index 951faa47849..909c624948c 100644 --- a/source3/modules/vfs_nfs4acl_xattr.c +++ b/source3/modules/vfs_nfs4acl_xattr.c @@ -331,18 +331,6 @@ static bool nfs4acl_xattr_fset_smb4acl(vfs_handle_struct *handle, return ret == 0; } -/* nfs4_set_nt_acl() - * set the local file's acls obtaining it in NT form - * using the NFSv4 format conversion - */ -static NTSTATUS nfs4_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, - uint32_t security_info_sent, - const struct security_descriptor *psd) -{ - return smb_set_nt_acl_nfs4(handle, fsp, NULL, security_info_sent, psd, - nfs4acl_xattr_fset_smb4acl); -} - static struct SMB4ACL_T *nfs4acls_defaultacl(TALLOC_CTX *mem_ctx) { struct SMB4ACL_T *pacl = NULL; @@ -590,7 +578,8 @@ static NTSTATUS nfs4acl_xattr_fset_nt_acl(vfs_handle_struct *handle, uint32_t security_info_sent, const struct security_descriptor *psd) { - return nfs4_set_nt_acl(handle, fsp, security_info_sent, psd); + return smb_set_nt_acl_nfs4(handle, fsp, NULL, security_info_sent, + psd, nfs4acl_xattr_fset_smb4acl); } /*