Attachment 12265 Details for Bug 11991 – Proposed WIP patch for master

[patch] Proposed WIP patch for master

rpc_server_startup.patch (text/plain), 4.26 KB, created by Andrew Bartlett on 2016-07-09 08:11:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2016-07-09 08:11:35 UTC

Size: 4.26 KB

patch

obsolete

>From f6c032b491ac5c6fe176c1ed99da20487777a26f Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Sat, 9 Jul 2016 17:34:39 +1200
>Subject: [PATCH 1/2] build: Always build eventlog6.  This is not a duplicate
> of eventlog
>
>The eventlog6 pipe is not a duplicate with the source3 code, so should be built even
>for the default build with smbd for file serving
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> source4/rpc_server/wscript_build | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
>index b9de1fb..ff2b82e 100755
>--- a/source4/rpc_server/wscript_build
>+++ b/source4/rpc_server/wscript_build
>@@ -158,8 +158,7 @@ bld.SAMBA_MODULE('dcerpc_eventlog',
> 	source='eventlog/dcesrv_eventlog6.c',
> 	subsystem='dcerpc_server',
> 	init_function='dcerpc_server_eventlog6_init',
>-	deps='DCERPC_COMMON',
>-	enabled=bld.CONFIG_SET('WITH_NTVFS_FILESERVER')
>+	deps='DCERPC_COMMON'
> 	)
> 
> bld.SAMBA_MODULE('dcerpc_dnsserver',
>-- 
>2.8.1
>
>
>From 233503437afb92ae3f8989b359d60f6804557f5b Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Sat, 9 Jul 2016 17:36:18 +1200
>Subject: [PATCH 2/2] docs: Correct the defaults for "dcerpc endpoint services"
>
>We must not list any services that we skip building, as otherwise all RPC services fail to start.
>
>We now build without the source4 spoolss server in non-developer builds
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
> docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml | 2 +-
> lib/param/loadparm.c                                   | 2 +-
> source3/param/loadparm.c                               | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
>index feecf62..8a217cc 100644
>--- a/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
>+++ b/docs-xml/smbdotconf/protocol/dcerpcendpointservers.xml
>@@ -6,6 +6,6 @@
> 	<para>Specifies which DCE/RPC endpoint servers should be run.</para>
> </description>
> 
>-<value type="default">epmapper, wkssvc, rpcecho, samr, netlogon, lsarpc, spoolss, drsuapi, dssetup, unixinfo, browser, eventlog6, backupkey, dnsserver</value>
>+<value type="default">epmapper, wkssvc, rpcecho, samr, netlogon, lsarpc, drsuapi, dssetup, unixinfo, browser, eventlog6, backupkey, dnsserver</value>
> <value type="example">rpcecho</value>
> </samba:parameter>
>diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
>index 19ee7eb..d6bd66d 100644
>--- a/lib/param/loadparm.c
>+++ b/lib/param/loadparm.c
>@@ -2569,7 +2569,7 @@ 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", "0");
> 
>-	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, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver");
> 	lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbindd ntp_signd kcc dnsupdate dns");
> 	lpcfg_do_global_parameter(lp_ctx, "kccsrv:samba_kcc", "false");
> 	/* the winbind method for domain controllers is for both RODC
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index c17c099..df700bc 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -869,7 +869,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
> 
> 	Globals.server_services = str_list_make_v3_const(NULL, "s3fs rpc nbt wrepl ldap cldap kdc drepl winbindd ntp_signd kcc dnsupdate dns", NULL);
> 
>-	Globals.dcerpc_endpoint_servers = str_list_make_v3_const(NULL, "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver", NULL);
>+	Globals.dcerpc_endpoint_servers = str_list_make_v3_const(NULL, "epmapper wkssvc rpcecho samr netlogon lsarpc drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver", NULL);
> 
> 	Globals.tls_enabled = true;
> 	Globals.tls_verify_peer = TLS_VERIFY_PEER_AS_STRICT_AS_POSSIBLE;
>-- 
>2.8.1
>

Actions: View

Attachments on bug 11991: 12202 | 12203 | 12206 | 12265