From: Ralph Boehme <slow@samba.org>
Date: Thu, 23 May 2019 14:22:39 +0000 (+0200)
Subject: vfs_fruit: only do cross protocol locking on non-internal opens
X-Git-Tag: samba-4.9.10~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b10eabed24d5acc6753a8045fa3ea7f08020ddad;p=thirdparty%2Fsamba.git

vfs_fruit: only do cross protocol locking on non-internal opens

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit f5f7d1e9bf7e39933ccf7c874e682f9df80a6fec)
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 9d0cd3cf727..b49dbc1a68c 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -6066,7 +6066,9 @@ static NTSTATUS fruit_create_file(vfs_handle_struct *handle,
 		return status;
 	}
 
-	if (config->locking == FRUIT_LOCKING_NETATALK) {
+	if ((config->locking == FRUIT_LOCKING_NETATALK) &&
+	    (fsp->op != NULL))
+	{
 		status = fruit_check_access(
 			handle, *result,
 			access_mask,