From: Ralph Boehme <slow@samba.org>
Date: Tue, 24 Nov 2020 17:02:26 +0000 (+0100)
Subject: vfs_fruit: disable fd reopening optimisations for the two special macOS streams
X-Git-Tag: samba-4.14.0rc1~332
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37003ec709041d523bec56ee17034cc6f3d26a09;p=thirdparty%2Fsamba.git

vfs_fruit: disable fd reopening optimisations for the two special macOS streams

I couldn't figure out why the reopen fails a few vfs.fruit tests, so for now
disable the optimisations. It only affects the two special Mac streams, so it's
not *that* bad, but definitely something we would want to improve on in the near
future.

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 352606b0f4a..e3bcd9fff4e 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1656,6 +1656,8 @@ static int fruit_openat(vfs_handle_struct *handle,
 
 	DBG_DEBUG("Path [%s] fd [%d]\n", smb_fname_str_dbg(smb_fname), fd);
 
+	/* Prevent reopen optimisation */
+	fsp->fsp_flags.have_proc_fds = false;
 	return fd;
 }