file_server: Move vfs objects initialisation into file_server.c smb.c…

…onf wrapper
darabosj · Apr 3, 2012 · 7cda954 · 7cda954
1 parent da50ff7
commit 7cda954
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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...";