From: Ralph Boehme <slow@samba.org>
Date: Wed, 22 Aug 2018 13:21:08 +0000 (+0200)
Subject: vfs_fruit: prepare fruit_pwrite_meta() for on-demand opening and writing
X-Git-Tag: tdb-1.3.17~1063
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a5c9a9e73230f640eb045a3c47af75b5be9f1d6;p=thirdparty%2Fsamba.git

vfs_fruit: prepare fruit_pwrite_meta() for on-demand opening and writing

This avoid creating files or blobs in our streams backend when a client
creates a stream but hasn't written anything yet. This is the only sane
way to implement the following semantics:

* client 1: create stream "file:foo"

* client 2: open stream "file:foo"

The second operation of client 2 must fail with NT_STATUS_NOT_FOUND.

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 60b74b48b6a..f567b5002ea 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -4495,10 +4495,44 @@ static ssize_t fruit_pwrite_meta_stream(vfs_handle_struct *handle,
 					files_struct *fsp, const void *data,
 					size_t n, off_t offset)
 {
+	struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
 	AfpInfo *ai = NULL;
 	size_t nwritten;
+	int ret;
 	bool ok;
 
+	DBG_DEBUG("Path [%s] offset=%"PRIdMAX", size=%zd\n",
+		  fsp_str_dbg(fsp), (intmax_t)offset, n);
+
+	if (fio == NULL) {
+		return -1;
+	}
+
+	if (fio->fake_fd) {
+		int fd;
+
+		ret = SMB_VFS_NEXT_CLOSE(handle, fsp);
+		if (ret != 0) {
+			DBG_ERR("Close [%s] failed: %s\n",
+				fsp_str_dbg(fsp), strerror(errno));
+			fsp->fh->fd = -1;
+			return -1;
+		}
+
+		fd = SMB_VFS_NEXT_OPEN(handle,
+				       fsp->fsp_name,
+				       fsp,
+				       fio->flags,
+				       fio->mode);
+		if (fd == -1) {
+			DBG_ERR("On-demand create [%s] in write failed: %s\n",
+				fsp_str_dbg(fsp), strerror(errno));
+			return -1;
+		}
+		fsp->fh->fd = fd;
+		fio->fake_fd = false;
+	}
+
 	ai = afpinfo_unpack(talloc_tos(), data);
 	if (ai == NULL) {
 		return -1;