diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-03 13:31:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-03 14:35:02 +1000 |
| commit | 7cda954fbbc80ffd89d3d8f7e6af32dd93def32d (patch) | |
| tree | 0aeb8835aa5f051a786972d09e57b5de17d3ddc5 | |
| parent | da50ff7f8481db9854843bac3c25d6fc0f0cfa9b (diff) | |
| download | samba-7cda954fbbc80ffd89d3d8f7e6af32dd93def32d.tar.gz samba-7cda954fbbc80ffd89d3d8f7e6af32dd93def32d.tar.bz2 samba-7cda954fbbc80ffd89d3d8f7e6af32dd93def32d.zip | |
file_server: Move vfs objects initialisation into file_server.c smb.conf wrapper
| -rw-r--r-- | file_server/file_server.c | 11 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/file_server/file_server.c b/file_server/file_server.c index 3f5ca77208..d3eb53c9a2 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 c46f192502..bc94d7c86c 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..."; |