From: Jeremy Allison <jra@samba.org>
Date: Thu, 10 Oct 2019 21:30:42 +0000 (-0700)
Subject: s3: VFS: vfs_full_audit: Remove chown_fn(). No longer used.
X-Git-Tag: talloc-2.3.1~350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2863a7e395bc5b73f8d9ef7bca7c21f20c7eeb3;p=thirdparty%2Fsamba.git

s3: VFS: vfs_full_audit: Remove chown_fn(). No longer used.

NB, this will now fail smb_vfs_assert_all_fns()
until we remove the chown_fn() from the VFS definitions.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
---

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 3c337a2e62b..a13c4da419b 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -140,7 +140,6 @@ typedef enum _vfs_op_type {
 	SMB_VFS_OP_UNLINKAT,
 	SMB_VFS_OP_CHMOD,
 	SMB_VFS_OP_FCHMOD,
-	SMB_VFS_OP_CHOWN,
 	SMB_VFS_OP_FCHOWN,
 	SMB_VFS_OP_LCHOWN,
 	SMB_VFS_OP_CHDIR,
@@ -283,7 +282,6 @@ static struct {
 	{ SMB_VFS_OP_UNLINKAT,	"unlinkat" },
 	{ SMB_VFS_OP_CHMOD,	"chmod" },
 	{ SMB_VFS_OP_FCHMOD,	"fchmod" },
-	{ SMB_VFS_OP_CHOWN,	"chown" },
 	{ SMB_VFS_OP_FCHOWN,	"fchown" },
 	{ SMB_VFS_OP_LCHOWN,	"lchown" },
 	{ SMB_VFS_OP_CHDIR,	"chdir" },
@@ -1546,21 +1544,6 @@ static int smb_full_audit_fchmod(vfs_handle_struct *handle, files_struct *fsp,
 	return result;
 }
 
-static int smb_full_audit_chown(vfs_handle_struct *handle,
-			const struct smb_filename *smb_fname,
-			uid_t uid,
-			gid_t gid)
-{
-	int result;
-
-	result = SMB_VFS_NEXT_CHOWN(handle, smb_fname, uid, gid);
-
-	do_log(SMB_VFS_OP_CHOWN, (result >= 0), handle, "%s|%ld|%ld",
-	       smb_fname->base_name, (long int)uid, (long int)gid);
-
-	return result;
-}
-
 static int smb_full_audit_fchown(vfs_handle_struct *handle, files_struct *fsp,
 			uid_t uid, gid_t gid)
 {
@@ -2972,7 +2955,6 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
 	.unlinkat_fn = smb_full_audit_unlinkat,
 	.chmod_fn = smb_full_audit_chmod,
 	.fchmod_fn = smb_full_audit_fchmod,
-	.chown_fn = smb_full_audit_chown,
 	.fchown_fn = smb_full_audit_fchown,
 	.lchown_fn = smb_full_audit_lchown,
 	.chdir_fn = smb_full_audit_chdir,