From: Jeremy Allison Date: Tue, 8 Jun 2021 23:35:24 +0000 (-0700) Subject: s3: VFS: non_posix_acls: Remove non_posix_sys_acl_blob_get_file_helper(). No longer... X-Git-Tag: tevent-0.11.0~464 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5e3dcc8a5cd29bbff5bcea84857f84a83d29e99;p=thirdparty%2Fsamba.git s3: VFS: non_posix_acls: Remove non_posix_sys_acl_blob_get_file_helper(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/non_posix_acls.c b/source3/modules/non_posix_acls.c index 45378796caf..81e126f7c0c 100644 --- a/source3/modules/non_posix_acls.c +++ b/source3/modules/non_posix_acls.c @@ -21,47 +21,6 @@ #include "../librpc/gen_ndr/ndr_xattr.h" #include "modules/non_posix_acls.h" -int non_posix_sys_acl_blob_get_file_helper(vfs_handle_struct *handle, - const struct smb_filename *smb_fname_in, - DATA_BLOB acl_as_blob, - TALLOC_CTX *mem_ctx, - DATA_BLOB *blob) -{ - int ret; - TALLOC_CTX *frame = talloc_stackframe(); - struct xattr_sys_acl_hash_wrapper acl_wrapper = {}; - struct smb_filename *smb_fname = cp_smb_filename_nostream(frame, - smb_fname_in); - - if (smb_fname == NULL) { - TALLOC_FREE(frame); - return -1; - } - - acl_wrapper.acl_as_blob = acl_as_blob; - - ret = smb_vfs_call_stat(handle, smb_fname); - if (ret == -1) { - TALLOC_FREE(frame); - return -1; - } - - acl_wrapper.owner = smb_fname->st.st_ex_uid; - acl_wrapper.group = smb_fname->st.st_ex_gid; - acl_wrapper.mode = smb_fname->st.st_ex_mode; - - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_struct_blob(blob, mem_ctx, - &acl_wrapper, - (ndr_push_flags_fn_t)ndr_push_xattr_sys_acl_hash_wrapper))) { - errno = EINVAL; - TALLOC_FREE(frame); - return -1; - } - - TALLOC_FREE(frame); - return 0; -} - int non_posix_sys_acl_blob_get_fd_helper(vfs_handle_struct *handle, files_struct *fsp, DATA_BLOB acl_as_blob, diff --git a/source3/modules/non_posix_acls.h b/source3/modules/non_posix_acls.h index 8924810c04d..efa0455078b 100644 --- a/source3/modules/non_posix_acls.h +++ b/source3/modules/non_posix_acls.h @@ -17,11 +17,6 @@ along with this program. If not, see . */ -int non_posix_sys_acl_blob_get_file_helper(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - DATA_BLOB acl_as_blob, - TALLOC_CTX *mem_ctx, - DATA_BLOB *blob); int non_posix_sys_acl_blob_get_fd_helper(vfs_handle_struct *handle, files_struct *fsp, DATA_BLOB acl_as_blob,