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 /source3 | |
| parent | be9a8cf4caaec26180c732041aeeb1b1bbda8e9e (diff) | |
| download | samba-8518dd6406c0132dfd8c44e084c2b39792974f2c.tar.gz samba-8518dd6406c0132dfd8c44e084c2b39792974f2c.tar.bz2 samba-8518dd6406c0132dfd8c44e084c2b39792974f2c.zip | |
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
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0b5a0e87f0..d9ce4b4b58 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); |