sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s4-lib/param: FLAG DAY for the default FILE SERVER

Browse Source 
This commit changes the default file server to be s3fs.  Existing
installs wishing to keep the ntvfs file server need to set this in
their smb.conf:

server services = +smb -s3fs
dcerpc endpoint services = +winreg +srvsvc

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2012-06-16 12:54:12 +10:00
parent b58dc1826e
commit 39766b75a4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/param/loadparm.c
View File

@ -3312,8 +3312,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default"); lpcfg_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
lpcfg_do_global_parameter(lp_ctx, "max connections", "-1"); lpcfg_do_global_parameter(lp_ctx, "max connections", "-1");
lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup unixinfo browser eventlog6 backupkey dnsserver"); lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver");
lpcfg_do_global_parameter(lp_ctx, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate"); lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate");
lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb"); lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
/* the winbind method for domain controllers is for both RODC /* the winbind method for domain controllers is for both RODC
auth forwarding and for trusted domains */ auth forwarding and for trusted domains */

3
selftest/target/Samba4.pm
View File

@ -580,7 +580,8 @@ sub provision_raw_step1($$)
panic action = $RealBin/gdb_backtrace \%d panic action = $RealBin/gdb_backtrace \%d
wins support = yes wins support = yes
server role = $ctx->{server_role} server role = $ctx->{server_role}
server services = +echo +dns server services = +echo +dns +smb -s3fs
dcerpc endpoint servers = +winreg +srvsvc
notify:inotify = false notify:inotify = false
ldb:nosync = true ldb:nosync = true
#We don't want to pass our self-tests if the PAC code is wrong #We don't want to pass our self-tests if the PAC code is wrong

8
source4/scripting/python/samba/provision/__init__.py
View File

@ -1658,10 +1658,10 @@ def provision(logger, session_info, credentials, smbconf=None,
if dns_backend == "SAMBA_INTERNAL": if dns_backend == "SAMBA_INTERNAL":
server_services.append("+dns") server_services.append("+dns")
if not use_ntvfs: if use_ntvfs:
server_services.append("-smb") server_services.append("+smb")
server_services.append("+s3fs") server_services.append("-s3fs")
global_param["dcerpc endpoint servers"] = ["-winreg", "-srvsvc"] global_param["dcerpc endpoint servers"] = ["+winreg", "+srvsvc"]
if len(server_services) > 0: if len(server_services) > 0:
global_param["server services"] = server_services global_param["server services"] = server_services