From 8518dd6406c0132dfd8c44e084c2b39792974f2c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 Aug 2012 23:34:24 +1000 Subject: 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 --- source3/param/loadparm.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'source3/param') 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); -- cgit