components/samba/samba36/patches/worm.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 10 Jun 2015 16:30:48 -0700
changeset 4463 0f8d88e8430f
parent 4433 components/samba/samba/samba36/patches/worm.patch@d35242d8330c
permissions -rw-r--r--
18462092 Update to Samba 4. (fix samba36 build)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4433
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     1
Samba.org patch source is referenced below.
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     2
WiKi page is:
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
https://wiki.samba.org/index.php/VFS/vfs_worm
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     4
changes against the community version:
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     5
 - removed support of grace time on file
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     6
 - slightly modified to run on VFS rev.28
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     7
-- Jiri Sasek
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     8
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     9
From 2004317c09d781a4ec1275aaa4a29289e798eff3 Mon Sep 17 00:00:00 2001
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    10
From: Volker Lendecke <[email protected]>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    11
Date: Wed, 20 Nov 2013 12:09:47 +0100
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    12
Subject: [PATCH] s3-modules: add new vfs_worm module
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    13
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    14
VFS module to disallow writes for older files.
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    15
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    16
Signed-off-by: Volker Lendecke <[email protected]>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    17
Reviewed-by: Stefan Metzmacher <[email protected]>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    18
Reviewed-by: Jeremy Allison <[email protected]>
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    19
---
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    20
 source3/modules/vfs_worm.c |   97 ++++++++++++++++++++++++++++++++++++++++++++
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    21
 1 files changed, 97 insertions(+), 0 deletions(-)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    22
 create mode 100644 source3/modules/vfs_worm.c
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    23
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    24
diff --git a/source3/modules/vfs_worm.c b/source3/modules/vfs_worm.c
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    25
new file mode 100644
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    26
index 0000000..77a18ca
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    27
--- /dev/null
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    28
+++ b/source3/modules/vfs_worm.c
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    29
@@ -0,0 +1,93 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    30
+/*
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    31
+ * VFS module to disallow writes for older files
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    32
+ *
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    33
+ * Copyright (C) 2013, Volker Lendecke
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    34
+ *
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    35
+ * This program is free software; you can redistribute it and/or modify
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    36
+ * it under the terms of the GNU General Public License as published by
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    37
+ * the Free Software Foundation; either version 3 of the License, or
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    38
+ * (at your option) any later version.
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    39
+ *
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    40
+ * This program is distributed in the hope that it will be useful,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    41
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    42
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    43
+ * GNU General Public License for more details.
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    44
+ *
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    45
+ * You should have received a copy of the GNU General Public License
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    46
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    47
+ */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    48
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    49
+#include "includes.h"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    50
+#include "smbd/smbd.h"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    51
+#include "system/filesys.h"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    52
+#include "libcli/security/security.h"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    53
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    54
+static NTSTATUS vfs_worm_create_file(vfs_handle_struct *handle,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    55
+				     struct smb_request *req,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    56
+				     uint16_t root_dir_fid,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    57
+				     struct smb_filename *smb_fname,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    58
+				     uint32_t access_mask,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    59
+				     uint32_t share_access,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    60
+				     uint32_t create_disposition,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    61
+				     uint32_t create_options,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    62
+				     uint32_t file_attributes,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    63
+				     uint32_t oplock_request,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    64
+				     uint64_t allocation_size,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    65
+				     uint32_t private_flags,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    66
+				     struct security_descriptor *sd,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    67
+				     struct ea_list *ea_list,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    68
+				     files_struct **result,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    69
+				     int *pinfo)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    70
+{
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    71
+	bool readonly = false;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    72
+	const uint32_t write_access_flags =
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    73
+		FILE_WRITE_DATA | FILE_APPEND_DATA |
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    74
+		FILE_WRITE_ATTRIBUTES | DELETE_ACCESS |
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    75
+		WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    76
+	NTSTATUS status;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    77
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    78
+	if (VALID_STAT(smb_fname->st)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    79
+		/* no grace_period supported */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    80
+		readonly = true;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    81
+	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    82
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    83
+	if (readonly && (access_mask & write_access_flags)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    84
+		return NT_STATUS_ACCESS_DENIED;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    85
+	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    86
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    87
+	status = SMB_VFS_NEXT_CREATE_FILE(
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    88
+		handle, req, root_dir_fid, smb_fname, access_mask,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    89
+		share_access, create_disposition, create_options,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    90
+		file_attributes, oplock_request, allocation_size,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    91
+		private_flags, sd, ea_list, result, pinfo);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    92
+	if (!NT_STATUS_IS_OK(status)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    93
+		return status;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    94
+	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    95
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    96
+	/*
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    97
+	 * Access via MAXIMUM_ALLOWED_ACCESS?
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    98
+	 */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    99
+	if (readonly && ((*result)->access_mask & write_access_flags)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   100
+		close_file(req, *result, NORMAL_CLOSE);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   101
+		return NT_STATUS_ACCESS_DENIED;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   102
+	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   103
+	return NT_STATUS_OK;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   104
+}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   105
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   106
+static struct vfs_fn_pointers vfs_worm_fns = {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   107
+	.create_file = vfs_worm_create_file,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   108
+};
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   109
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   110
+NTSTATUS vfs_worm_init(void);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   111
+NTSTATUS vfs_worm_init(void)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   112
+{
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   113
+	NTSTATUS ret;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   114
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   115
+	ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "worm",
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   116
+			       &vfs_worm_fns);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   117
+	if (!NT_STATUS_IS_OK(ret)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   118
+		return ret;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   119
+	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   120
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   121
+	return ret;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   122
+}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   123
-- 
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   124
1.7.0.4
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   125
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   126
   Makefile.in and configure.in adds
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   127
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   128
--- a/source3/configure.in	2013-01-17 15:54:47.194376100 -0800
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   129
+++ b/source3/configure.in	2013-01-17 15:58:39.854303900 -0800
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   130
@@ -6994,6 +6994,7 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   131
 SMB_MODULE(vfs_preopen, \$(VFS_PREOPEN_OBJ), "bin/preopen.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   132
 SMB_MODULE(vfs_syncops, \$(VFS_SYNCOPS_OBJ), "bin/syncops.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   133
 SMB_MODULE(vfs_zfsacl, \$(VFS_ZFSACL_OBJ), "bin/zfsacl.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   134
+SMB_MODULE(vfs_worm, \$(VFS_WORM_OBJ), "bin/worm.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   135
 AC_SUBST(SAMFS_LIBS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   136
 SMB_MODULE(vfs_samfs, \$(VFS_SAMFS_OBJ), "bin/samfs.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   137
 SMB_MODULE(vfs_notify_fam, \$(VFS_NOTIFY_FAM_OBJ), "bin/notify_fam.$SHLIBEXT", VFS)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   138
--- a/source3/Makefile.in	2013-01-17 15:55:00.777531900 -0800
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   139
+++ b/source3/Makefile.in	2013-01-17 16:02:06.513093500 -0800
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   140
@@ -813,6 +813,7 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   141
 VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   142
 VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   143
 VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o modules/nfs4_acls.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   144
+VFS_WORM_OBJ = modules/vfs_worm.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   145
 VFS_SAMFS_OBJ = modules/vfs_samfs.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   146
 VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   147
 VFS_IRIXACL_OBJ = modules/vfs_irixacl.o
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   148
@@ -2967,6 +2968,10 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   149
 	@echo "Building plugin $@"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   150
 	@$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   151
 
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   152
+bin/worm.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_WORM_OBJ)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   153
+	@echo "Building plugin $@"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   154
+	@$(SHLD_MODULE) $(VFS_WORM_OBJ)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   155
+
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   156
 bin/samfs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SAMFS_OBJ)
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   157
 	@echo "Building plugin $@"
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
   158
 	@$(SHLD_MODULE) $(VFS_SAMFS_OBJ) @SAMFS_LIBS@