Attachment 12872 Details for Bug 12524 – Patch for 4.6 cherry-picked from master

[patch] Patch for 4.6 cherry-picked from master

v46-bug12524.patch (text/plain), 2.39 KB, created by Ralph Böhme on 2017-01-31 06:04:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-01-31 06:04:36 UTC

Size: 2.39 KB

patch

obsolete

>From 305aaad8223bf240b4908ef1f32b0b35b9aede21 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 16 Jan 2017 12:24:54 +0100
>Subject: [PATCH] s3/rpc_server: move rpc_modules.c to its own subsystem
>
>The source file rpc_modules.c was used in two places which lead to the
>following build error when configuring with '--nonshared-binary=smbd/smbd':
>
>  ERROR: source source3/rpc_server/rpc_modules.c is in more than one
>  subsystem of target 'smbd/smbd': ['RPC_SERVICE', 'MDSSD']
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12524
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Noel Power <nopower@suse.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Fri Jan 20 15:00:45 CET 2017 on sn-devel-144
>
>(cherry picked from commit be8e90f27a70f3ba8d708e984cf7b2a34e8c2628)
>---
> source3/rpc_server/wscript_build | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
>index 1d0facb..ed378c5 100755
>--- a/source3/rpc_server/wscript_build
>+++ b/source3/rpc_server/wscript_build
>@@ -39,6 +39,10 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVER',
>                     NDR_NAMED_PIPE_AUTH
>                     ''')
> 
>+bld.SAMBA3_SUBSYSTEM('RPC_MODULES',
>+                    source='rpc_modules.c',
>+                    deps='samba-util')
>+
> ### RPC_SERVICES
> bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
>                     source='''dssetup/srv_dssetup_nt.c
>@@ -150,11 +154,12 @@ bld.SAMBA3_SUBSYSTEM('RPC_SERVER_REGISTER',
>                     deps='samba-util')
> 
> bld.SAMBA3_SUBSYSTEM('RPC_SERVICE',
>-                    source='rpc_service_setup.c rpc_modules.c',
>+                    source='rpc_service_setup.c',
>                     deps='''
>                     rpc
>                     RPC_SERVER
>                     RPC_SERVER_REGISTER
>+		    RPC_MODULES
>                     RPC_SAMR
>                     RPC_LSARPC
>                     RPC_WINREG
>@@ -192,6 +197,6 @@ bld.SAMBA3_SUBSYSTEM('FSSD',
>                     deps='samba-util')
> 
> bld.SAMBA3_SUBSYSTEM('MDSSD',
>-                    source='mdssd.c rpc_modules.c',
>-                    deps='RPC_SOCK_HELPER samba-util',
>+                    source='mdssd.c',
>+                    deps='RPC_SOCK_HELPER RPC_MODULES samba-util',
>                     enabled=bld.env.with_spotlight)
>-- 
>2.9.3
>

Flags:

asn: review+

Actions: View

Attachments on bug 12524: 12871 | 12872