sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s3:rpc_server: Do not generate and build s3 RPC server code

Browse Source 
Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Samuel Cabrero 2019-05-28 17:01:36 +02:00 committed by Samuel Cabrero
parent 4c09839ec9
commit e8e4ecfb8b
4 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
librpc/idl/wscript_build
View File

@ -11,7 +11,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
witness.idl clusapi.idl
mdssvc.idl''',
options='--header --ndr-parser --samba3-ndr-server --server-compat --server --client --python',
options='--header --ndr-parser --server-compat --server --client --python',
output_dir='../gen_ndr')
# The interface names here are not the same as the IDL name, so the
@ -21,7 +21,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
fsrvp.idl
lsa.idl
winspool.idl''',
options='--header --ndr-parser --samba3-ndr-server --server-compat --server --client --python',
options='--header --ndr-parser --server-compat --server --client --python',
output_dir='../gen_ndr',
generate_fuzzers=False)
@ -34,14 +34,14 @@ bld.SAMBA_PIDL_LIST('PIDL',
# Services that we only have a server in the source3 style
bld.SAMBA_PIDL_LIST('PIDL',
'''initshutdown.idl ntsvcs.idl''',
options='--header --ndr-parser --client --python --samba3-ndr-server --server-compat',
options='--header --ndr-parser --client --python --server-compat',
output_dir='../gen_ndr')
# The interface names here are not the same as the IDL name, so the
# auto-genration of the fuzzer fails to link
bld.SAMBA_PIDL_LIST('PIDL',
'''dfs.idl''',
options='--header --ndr-parser --client --python --samba3-ndr-server --server-compat',
options='--header --ndr-parser --client --python --server-compat',
output_dir='../gen_ndr',
generate_fuzzers=False)
@ -170,6 +170,6 @@ bld.SAMBA_PIDL_LIST('PIDL',
bld.SAMBA_PIDL_LIST('PIDL',
'winbind.idl',
options='--header --ndr-parser --samba3-ndr-server --server-compat --client --python',
options='--header --ndr-parser --server-compat --client --python',
output_dir='../gen_ndr')

5
librpc/wscript_build
View File

@ -678,11 +678,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
public_deps='dcerpc NDR_WINBIND'
)
bld.SAMBA3_SUBSYSTEM('SRV_NDR_WINBIND',
source='gen_ndr/srv_winbind.c',
public_deps='NDR_WINBIND'
)
bld.SAMBA_SUBSYSTEM('NDR_FSRVP_STATE',
source='gen_ndr/ndr_fsrvp_state.c',
public_deps='ndr'

46
source3/rpc_server/wscript_build
View File

@ -41,13 +41,11 @@ bld.SAMBA3_SUBSYSTEM('RPC_MODULES',
### RPC_SERVICES
bld.SAMBA3_SUBSYSTEM('RPC_DSSETUP',
source='''dssetup/srv_dssetup_nt.c
../../librpc/gen_ndr/srv_dssetup.c''',
source='''dssetup/srv_dssetup_nt.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_EPMAPPER',
source='''epmapper/srv_epmapper.c
../../librpc/gen_ndr/srv_epmapper.c''',
source='''epmapper/srv_epmapper.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_FSS_STATE',
@ -55,51 +53,42 @@ bld.SAMBA3_SUBSYSTEM('RPC_FSS_STATE',
deps='samba-util NDR_FSRVP_STATE')
bld.SAMBA3_SUBSYSTEM('RPC_FSS_AGENT',
source='''fss/srv_fss_agent.c
../../librpc/gen_ndr/srv_fsrvp.c''',
source='''fss/srv_fss_agent.c''',
deps='samba-util RPC_FSS_STATE')
bld.SAMBA3_SUBSYSTEM('RPC_EVENTLOG',
source='''eventlog/srv_eventlog_nt.c
eventlog/srv_eventlog_reg.c
../../librpc/gen_ndr/srv_eventlog.c''',
eventlog/srv_eventlog_reg.c''',
deps='LIBEVENTLOG LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_INITSHUTDOWN',
source='''initshutdown/srv_initshutdown_nt.c
../../librpc/gen_ndr/srv_initshutdown.c''',
source='''initshutdown/srv_initshutdown_nt.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_LSARPC',
source='''lsa/srv_lsa_nt.c
../../librpc/gen_ndr/srv_lsa.c''',
source='''lsa/srv_lsa_nt.c''',
deps='SRV_ACCESS_CHECK LIBLSA GNUTLS_HELPERS')
bld.SAMBA3_SUBSYSTEM('RPC_NETDFS',
source='''dfs/srv_dfs_nt.c
../../librpc/gen_ndr/srv_dfs.c''',
source='''dfs/srv_dfs_nt.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_NETLOGON',
source='''netlogon/srv_netlog_nt.c
../../librpc/gen_ndr/srv_netlogon.c''',
source='''netlogon/srv_netlog_nt.c''',
deps='LIBCLI_AUTH')
bld.SAMBA3_SUBSYSTEM('RPC_NTSVCS',
source='''ntsvcs/srv_ntsvcs_nt.c
../../librpc/gen_ndr/srv_ntsvcs.c''',
source='''ntsvcs/srv_ntsvcs_nt.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_RPCECHO',
source='''echo/srv_echo_nt.c
../../librpc/gen_ndr/srv_echo.c''',
source='''echo/srv_echo_nt.c''',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('RPC_SAMR',
source='''samr/srv_samr_nt.c
samr/srv_samr_util.c
samr/srv_samr_chgpasswd.c
../../librpc/gen_ndr/srv_samr.c''',
samr/srv_samr_chgpasswd.c''',
deps='PLAINTEXT_AUTH SRV_ACCESS_CHECK')
bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
@ -115,24 +104,20 @@ bld.SAMBA3_SUBSYSTEM('RPC_IREMOTEWINSPOOL',
deps='RPC_SPOOLSS')
bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
source='''srvsvc/srv_srvsvc_nt.c
../../librpc/gen_ndr/srv_srvsvc.c''',
source='''srvsvc/srv_srvsvc_nt.c''',
deps='samba-util tdb')
bld.SAMBA3_SUBSYSTEM('RPC_SVCCTL',
source='''svcctl/srv_svcctl_nt.c
svcctl/srv_svcctl_reg.c
../../librpc/gen_ndr/srv_svcctl.c''',
svcctl/srv_svcctl_reg.c''',
deps='SERVICES LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_WINREG',
source='''winreg/srv_winreg_nt.c
../../librpc/gen_ndr/srv_winreg.c''',
source='''winreg/srv_winreg_nt.c''',
deps='REG_FULL REGFIO NDR_PERFCOUNT')
bld.SAMBA3_SUBSYSTEM('RPC_WKSSVC',
source='''wkssvc/srv_wkssvc_nt.c
../../librpc/gen_ndr/srv_wkssvc.c''',
source='''wkssvc/srv_wkssvc_nt.c''',
deps='LIBNET')
bld.SAMBA3_SUBSYSTEM('mdssvc',
@ -145,7 +130,6 @@ rpc_mdssvc_sources = '''
mdssvc/mdssvc.c
mdssvc/mdssvc_noindex.c
mdssvc/srv_mdssvc_nt.c
../../librpc/gen_ndr/srv_mdssvc.c
'''
rpc_mdssvc_deps = 'mdssvc samba-util '

1
source3/winbindd/wscript_build
View File

@ -271,7 +271,6 @@ bld.SAMBA3_SUBSYSTEM('winbindd-lib',
SLCACHE
RPC_NDR_DSSETUP
RPC_NDR_WINBIND
SRV_NDR_WINBIND
RPC_SAMR
RPC_LSARPC
RPC_SERVER