From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 3 Apr 2012 03:31:15 +0000 (+1000)
Subject: file_server: Move vfs objects initialisation into file_server.c smb.conf wrapper
X-Git-Tag: samba-4.0.0alpha19~111
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=7cda954fbbc80ffd89d3d8f7e6af32dd93def32d

file_server: Move vfs objects initialisation into file_server.c smb.conf wrapper
---

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 3f5ca772080..d3eb53c9a29 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -57,7 +57,18 @@ static const char *generate_smb_conf(struct task_server *task)
 	fdprintf(fd, "rpc_daemon:spoolssd = disabled\n");
 	fdprintf(fd, "rpc_server:tcpip = no\n");
 
+	/* If we are using posix:eadb then we need to load another VFS object */
+	if (lpcfg_parm_string(lp_ctx, NULL, "posix", "eadb")) {
+		fdprintf(fd, "vfs objects = acl_xattr posix_eadb\n");
+	} else {
+		fdprintf(fd, "vfs objects = acl_xattr\n");
+	}
+
 	fdprintf(fd, "include = %s\n", lpcfg_configfile(lp_ctx));
+
+	fdprintf(fd, "[IPC$]\n");
+	fdprintf(fd, " vfs objects = dfs_samba4\n");
+
 	close(fd);
 	return path;
 }
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index c46f192502a..bc94d7c86c2 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1269,9 +1269,6 @@ sub provision_plugin_s4_dc($$)
 server services = -smb +s3fs
 dcerpc endpoint servers = -unixinfo -spoolss -winreg -wkssvc -srvsvc
 
-[IPC\$]
-	vfs objects = dfs_samba4
-
 ";
 
 	print "PROVISIONING PLUGIN S4 DC...";