diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-22 23:34:24 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-23 15:02:26 +0200 |
| commit | 8518dd6406c0132dfd8c44e084c2b39792974f2c (patch) | |
| tree | 765cf3df1f040193c52ebc6513becda39d3eef17 | |
| parent | be9a8cf4caaec26180c732041aeeb1b1bbda8e9e (diff) | |
| download | samba-8518dd6406c0132dfd8c44e084c2b39792974f2c.tar.gz | |
file_server: Move default VFS module settings to loadparm.c
This means that any utility that calls into the VFS layer will get the
right modules.
Because we use the fake_acls backend we need to override this whole
list in Samba4.pm however.
Andrew Bartlett
| -rw-r--r-- | file_server/file_server.c | 12 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 13 |
3 files changed, 14 insertions, 13 deletions
diff --git a/file_server/file_server.c b/file_server/file_server.c index 2b9e48a38bb..448894ecbda 100644 --- a/file_server/file_server.c +++ b/file_server/file_server.c @@ -61,15 +61,6 @@ 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 xattr_tdb:file or posix:eadb then we need to load another VFS object */ - if (lpcfg_parm_string(lp_ctx, NULL, "xattr_tdb", "file")) { - fdprintf(fd, "vfs objects = acl_xattr xattr_tdb\n"); - } else 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, "map hidden = no\n"); fdprintf(fd, "map system = no\n"); fdprintf(fd, "map readonly = no\n"); @@ -77,9 +68,6 @@ static const char *generate_smb_conf(struct task_server *task) 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 4b6af336b78..248a7259f78 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1367,7 +1367,7 @@ sub provision_plugin_s4_dc($$) create mask = 755 dos filemode = yes - vfs objects = acl_xattr fake_acls xattr_tdb streams_depot + vfs objects = dfs_samba4 acl_xattr fake_acls xattr_tdb streams_depot dcerpc endpoint servers = -winreg -srvsvc diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0b5a0e87f01..d9ce4b4b584 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4902,6 +4902,19 @@ static bool lp_load_ex(const char *pszFname, fault_configure(smb_panic_s3); + if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC) { + const char **vfs_objects = lp_vfs_objects(-1); + if (!vfs_objects || !vfs_objects[0]) { + if (lp_parm_const_string(-1, "xattr_tdb", "file", NULL)) { + lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr xattr_tdb"); + } else if (lp_parm_const_string(-1, "posix", "eadb", NULL)) { + lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr posix_eadb"); + } else { + lp_do_parameter(-1, "vfs objects", "dfs_samba4 acl_xattr"); + } + } + } + bAllowIncludeRegistry = true; return (bRetval); |