sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

file_server: Move default VFS module settings to loadparm.c

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2012-08-22 23:34:24 +10:00
parent be9a8cf4ca
commit 8518dd6406
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
file_server/file_server.c
View File

@ -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;
}

2
selftest/target/Samba4.pm
View File

@ -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

13
source3/param/loadparm.c
View File

@ -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);