diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 12:54:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-16 08:18:10 +0200 |
| commit | 39766b75a40fbab73fc23dd947de44f8349ed466 (patch) | |
| tree | 7d655aa7731e3897673245dc3b3e6f8cfb551c57 | |
| parent | b58dc1826e69c61a30d38b05e7f451404670baef (diff) | |
| download | samba-39766b75a40fbab73fc23dd947de44f8349ed466.tar.gz samba-39766b75a40fbab73fc23dd947de44f8349ed466.tar.bz2 samba-39766b75a40fbab73fc23dd947de44f8349ed466.zip | |
s4-lib/param: FLAG DAY for the default FILE SERVER
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
| -rw-r--r-- | lib/param/loadparm.c | 4 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 3 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 5749c34696..41c8cc62ec 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -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, "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, "server services", "smb rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate"); + 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", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate"); lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb"); /* the winbind method for domain controllers is for both RODC auth forwarding and for trusted domains */ diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 954cf9c820..2c26ffcbcf 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -580,7 +580,8 @@ sub provision_raw_step1($$) panic action = $RealBin/gdb_backtrace \%d wins support = yes server role = $ctx->{server_role} - server services = +echo +dns + server services = +echo +dns +smb -s3fs + dcerpc endpoint servers = +winreg +srvsvc notify:inotify = false ldb:nosync = true #We don't want to pass our self-tests if the PAC code is wrong diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 26d20d97b6..0ec072c392 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -1658,10 +1658,10 @@ def provision(logger, session_info, credentials, smbconf=None, if dns_backend == "SAMBA_INTERNAL": server_services.append("+dns") - if not use_ntvfs: - server_services.append("-smb") - server_services.append("+s3fs") - global_param["dcerpc endpoint servers"] = ["-winreg", "-srvsvc"] + if use_ntvfs: + server_services.append("+smb") + server_services.append("-s3fs") + global_param["dcerpc endpoint servers"] = ["+winreg", "+srvsvc"] if len(server_services) > 0: global_param["server services"] = server_services |