From: Ralph Boehme <slow@samba.org>
Date: Sat, 20 Oct 2018 12:54:48 +0000 (+0200)
Subject: vfs_fruit: don't unlink 0-byte size truncated streams
X-Git-Tag: tdb-1.3.17~1074
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287082d739362ad068df37076712927ccd7ca90c;p=thirdparty%2Fsamba.git

vfs_fruit: don't unlink 0-byte size truncated streams

This caused all sort of havoc with subsequent SMB request that acted on
the handle of the then deleted backend storage (file or blob, depending
on the used streams module).

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 caa06201308..24486f15e9a 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -5816,13 +5816,6 @@ static int fruit_ftruncate(struct vfs_handle_struct *handle,
 		  (intmax_t)offset);
 
 	if (fio == NULL) {
-		if (offset == 0 &&
-		    global_fruit_config.nego_aapl &&
-		    is_ntfs_stream_smb_fname(fsp->fsp_name) &&
-		    !is_ntfs_default_stream_smb_fname(fsp->fsp_name))
-		{
-			return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
-		}
 		return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
 	}