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 3f5ca7720801611c5b54111aa353800f12599bd5..d3eb53c9a29eca6c38cd853d647ff75e2f3d3cc4 100644 (file)
--- 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 c46f192502a281cfbb370fdf2e12928ba94c1f61..bc94d7c86c20b588cdefe42e78b35f384b5cd287 100644 (file)
--- 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...";