From: Ralph Boehme <slow@samba.org>
Date: Mon, 15 Oct 2018 16:38:33 +0000 (+0200)
Subject: vfs_fruit: remove resource fork special casing
X-Git-Tag: tdb-1.3.17~1066
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a26032c3f68028b01fb6a7d38851409db1858161;p=thirdparty%2Fsamba.git

vfs_fruit: remove resource fork special casing

Directly unlinking a file with open handles is not good, don't do it.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13646

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

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 45dec2a3f57..d0ed0201ecb 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -5736,10 +5736,6 @@ static int fruit_ftruncate_rsrc_xattr(struct vfs_handle_struct *handle,
 				      struct files_struct *fsp,
 				      off_t offset)
 {
-	if (offset == 0) {
-		return SMB_VFS_FREMOVEXATTR(fsp, AFPRESOURCE_EA_NETATALK);
-	}
-
 #ifdef HAVE_ATTROPEN
 	return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
 #endif
@@ -5787,10 +5783,6 @@ static int fruit_ftruncate_rsrc_stream(struct vfs_handle_struct *handle,
 				       struct files_struct *fsp,
 				       off_t offset)
 {
-	if (offset == 0) {
-		return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
-	}
-
 	return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
 }