summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-01-06 14:25:00 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-01-28 17:26:41 +1300
commitaaab6d5fab098956a97e40b240829fd379feec96 (patch)
treed473ad9a2926d5c7ff4c05445d08f852ae0ada75
parent8f95b42f603de70cac8a48ed74aa65171e3afbef (diff)
downloadsamba-aaab6d5fab098956a97e40b240829fd379feec96.tar.gz
samba-aaab6d5fab098956a97e40b240829fd379feec96.tar.xz
samba-aaab6d5fab098956a97e40b240829fd379feec96.zip
param: set a default list of dcerpc endpoint servers in s3 loadparm and update docs to be consistent
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
-rw-r--r--docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml4
-rw-r--r--source3/param/loadparm.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
index b6d5ddc13b0..75a41fc6e90 100644
--- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
+++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
@@ -7,6 +7,6 @@
<para>Specifies which DCE/RPC endpoint servers should be run.</para>
</description>
-<value type="example">epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey</value>
-<value type="default">rpcecho</value>
+<value type="default">epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver</value>
+<value type="example">rpcecho</value>
</samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 76169940845..cef939aac36 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1043,6 +1043,8 @@ static void init_globals(bool reinit_globals)
Globals.server_services = (const char **)str_list_make_v3(NULL, "s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate dns", NULL);
+ Globals.dcerpc_endpoint_servers = (const char **)str_list_make_v3(NULL, "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver", NULL);
+
/* Now put back the settings that were set with lp_set_cmdline() */
apply_lp_set_cmdline();
}