summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/posix_acls.c14
-rw-r--r--source3/smbd/vfs.c9
2 files changed, 0 insertions, 23 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index f71b31172b4..4ad5c2b4284 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4537,26 +4537,12 @@ int posix_sys_acl_blob_get_file(vfs_handle_struct *handle,
return -1;
}
- acl_wrapper.access_acl
- = smb_vfs_call_sys_acl_get_file(handle,
- smb_fname,
- SMB_ACL_TYPE_ACCESS,
- frame);
-
ret = smb_vfs_call_stat(handle, smb_fname);
if (ret == -1) {
TALLOC_FREE(frame);
return -1;
}
- if (S_ISDIR(smb_fname->st.st_ex_mode)) {
- acl_wrapper.default_acl
- = smb_vfs_call_sys_acl_get_file(handle,
- smb_fname,
- SMB_ACL_TYPE_DEFAULT,
- frame);
- }
-
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;
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 3cfd0203b8c..ac6051d8121 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -2732,15 +2732,6 @@ NTSTATUS smb_vfs_call_audit_file(struct vfs_handle_struct *handle,
access_denied);
}
-SMB_ACL_T smb_vfs_call_sys_acl_get_file(struct vfs_handle_struct *handle,
- const struct smb_filename *smb_fname,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx)
-{
- VFS_FIND(sys_acl_get_file);
- return handle->fns->sys_acl_get_file_fn(handle, smb_fname, type, 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,