diff options
Diffstat (limited to 'source3/wscript_build')
| -rw-r--r-- | source3/wscript_build | 77 |
1 files changed, 14 insertions, 63 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 168edb3f0e..5b5bf3aa97 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -378,52 +378,10 @@ SERVICES_SRC = '''services/svc_spoolss.c LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c''' -RPC_STATIC = '' - -RPC_LSARPC_SRC = '''rpc_server/srv_lsa_nt.c - ../librpc/gen_ndr/srv_lsa.c''' - -RPC_NETLOGON_SRC = '''rpc_server/srv_netlog_nt.c - ../librpc/gen_ndr/srv_netlogon.c''' - -RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c - rpc_server/srv_samr_util.c - rpc_server/srv_samr_chgpasswd.c - ../librpc/gen_ndr/srv_samr.c''' - -RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c''' - -RPC_WINREG_SRC = '''rpc_server/srv_winreg_nt.c - ../librpc/gen_ndr/srv_winreg.c''' - -RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c''' - -RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c - ../librpc/gen_ndr/srv_srvsvc.c''' - -RPC_WKSSVC_SRC = '''../librpc/gen_ndr/srv_wkssvc.c - rpc_server/srv_wkssvc_nt.c''' - -RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c - ../librpc/gen_ndr/srv_svcctl.c''' - -RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c - ../librpc/gen_ndr/srv_ntsvcs.c''' - -RPC_NETDFS_SRC = '''../librpc/gen_ndr/srv_dfs.c - rpc_server/srv_dfs_nt.c''' - -RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c - rpc_server/srv_spoolss_util.c - ../librpc/gen_ndr/srv_spoolss.c''' - -RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c - ../librpc/gen_ndr/srv_eventlog.c''' - NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c ../librpc/gen_ndr/ndr_named_pipe_auth.c''' -RPC_NCACN_NP = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np.c +RPC_NCACN_NP = '''rpc_server/rpc_ncacn_np.c rpc_server/rpc_handles.c''' RPC_SERVICE = '''rpc_server/rpc_server.c''' @@ -435,9 +393,7 @@ RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}''' -RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c''' - -RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}''' +RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}''' RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c''' @@ -567,17 +523,21 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c auth/server_info_sam.c auth/user_info.c auth/user_util.c - rpc_server/srv_samr_chgpasswd.c ../nsswitch/libwbclient/wb_reqtrans.c''' WINBINDD_SRC = '''${WINBINDD_SRC1} - ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC} + ${RPC_NCACN_NP} ${NPA_TSTREAM_SRC} ${TDB_VALIDATE_SRC} ${LIBCLI_DSSETUP_SRC} ${LIBCLI_LSA_SRC} ${LIBCLI_SAMR_SRC} ${LIBCLI_NETLOGON_SRC} - rpc_client/init_netlogon.c''' + rpc_client/init_netlogon.c + rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c + rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c + rpc_server/srv_samr_util.c + rpc_server/srv_samr_chgpasswd.c + rpc_server/srv_pipe_register.c''' MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c''' @@ -986,6 +946,7 @@ for prefix in bld.env.MODULE_PREFIXES: if prefix == 'gpext': continue if prefix == 'vfs': continue if prefix == 'nss_info': continue + if prefix == 'rpc': continue static_key = "%s_STATIC" % prefix.upper() shared_key = "%s_SHARED" % prefix.upper() @@ -1181,22 +1142,11 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE', NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER - vfs vfs_default vfs_posixacl RPC_MODULES auth LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE LIBNET LIBEVENTLOG - REGFIO REG_API_REGF PRINTING PRINTBACKEND SERVICES NDR_XATTR NDR_PERFCOUNT SOCKET_WRAPPER - RPCCLI_WINREG''', + vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE + PRINTING PRINTBACKEND NDR_XATTR REGFIO SOCKET_WRAPPER + ''', vars=locals()) -if not bld.env.developer: - bld.SAMBA_SUBSYSTEM('RPC_RPCECHO', - source='') - -bld.SAMBA_SUBSYSTEM('RPC_MODULES', - source='', - deps='''RPC_LSARPC RPC_SAMR RPC_WINREG RPC_INITSHUTDOWN - RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS - RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS - RPC_EVENTLOG RPC_RPCECHO''') - bld.SAMBA_SUBSYSTEM('LOCKING', source='${LOCKING_SRC}', deps='''tdb talloc''', @@ -1604,6 +1554,7 @@ bld.RECURSE('passdb') bld.RECURSE('winbindd') bld.RECURSE('libgpo/gpext') bld.RECURSE('pam_smbpass') +bld.RECURSE('rpc_server') bld.ENFORCE_GROUP_ORDERING() bld.CHECK_PROJECT_RULES() |