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 --- file_server/file_server.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'file_server') 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; } -- cgit v1.2.1