From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Sep 2019 00:54:00 +0000 (-0700)
Subject: s3: VFS: vfs_acl_common: Convert unlink_acl_common(), acl_common_remove_object()... 
X-Git-Tag: talloc-2.3.1~618
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8bdf5db6eb97458450392e2646db746a78b4d81;p=thirdparty%2Fsamba.git

s3: VFS: vfs_acl_common: Convert unlink_acl_common(), acl_common_remove_object() to UNLINKAT.

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

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index a9d53ff6857..6ddb983964e 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -1157,7 +1157,10 @@ static int acl_common_remove_object(vfs_handle_struct *handle,
 	if (is_directory) {
 		ret = SMB_VFS_NEXT_RMDIR(handle, &local_fname);
 	} else {
-		ret = SMB_VFS_NEXT_UNLINK(handle, &local_fname);
+		ret = SMB_VFS_NEXT_UNLINKAT(handle,
+				conn->cwd_fsp,
+				&local_fname,
+				0);
 	}
 	unbecome_root();
 
@@ -1211,7 +1214,10 @@ int unlink_acl_common(struct vfs_handle_struct *handle,
 	int ret;
 
 	/* Try the normal unlink first. */
-	ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+	ret = SMB_VFS_NEXT_UNLINKAT(handle,
+				dirfsp,
+				smb_fname,
+				flags);
 	if (ret == 0) {
 		return 0;
 	}