From: Jeremy Allison Date: Tue, 14 Apr 2020 17:20:10 +0000 (-0700) Subject: s3: VFS: full_audit. Remove get_nt_acl_fn(). X-Git-Tag: ldb-2.2.0~572 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7acbef462bd831b377df422d343bcf7938f02855;p=thirdparty%2Fsamba.git s3: VFS: full_audit. Remove get_nt_acl_fn(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index b499f55b841..c9b294975f2 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -190,7 +190,6 @@ typedef enum _vfs_op_type { /* NT ACL operations. */ SMB_VFS_OP_FGET_NT_ACL, - SMB_VFS_OP_GET_NT_ACL, SMB_VFS_OP_GET_NT_ACL_AT, SMB_VFS_OP_FSET_NT_ACL, SMB_VFS_OP_AUDIT_FILE, @@ -329,7 +328,6 @@ static struct { { SMB_VFS_OP_SET_DOS_ATTRIBUTES, "set_dos_attributes" }, { SMB_VFS_OP_FSET_DOS_ATTRIBUTES, "fset_dos_attributes" }, { SMB_VFS_OP_FGET_NT_ACL, "fget_nt_acl" }, - { SMB_VFS_OP_GET_NT_ACL, "get_nt_acl" }, { SMB_VFS_OP_GET_NT_ACL_AT, "get_nt_acl_at" }, { SMB_VFS_OP_FSET_NT_ACL, "fset_nt_acl" }, { SMB_VFS_OP_AUDIT_FILE, "audit_file" }, @@ -2437,23 +2435,6 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru return result; } -static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - uint32_t security_info, - TALLOC_CTX *mem_ctx, - struct security_descriptor **ppdesc) -{ - NTSTATUS result; - - result = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info, - mem_ctx, ppdesc); - - do_log(SMB_VFS_OP_GET_NT_ACL, NT_STATUS_IS_OK(result), handle, - "%s", smb_fname_str_do_log(handle->conn, smb_fname)); - - return result; -} - static NTSTATUS smb_full_audit_get_nt_acl_at(vfs_handle_struct *handle, struct files_struct *dirfsp, const struct smb_filename *smb_fname, @@ -3071,7 +3052,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = { .set_dos_attributes_fn = smb_full_audit_set_dos_attributes, .fset_dos_attributes_fn = smb_full_audit_fset_dos_attributes, .fget_nt_acl_fn = smb_full_audit_fget_nt_acl, - .get_nt_acl_fn = smb_full_audit_get_nt_acl, .get_nt_acl_at_fn = smb_full_audit_get_nt_acl_at, .fset_nt_acl_fn = smb_full_audit_fset_nt_acl, .audit_file_fn = smb_full_audit_audit_file,