From c61089219b82ff94f83e1fb428e8b47ad778c868 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 2 Feb 2004 13:43:03 +0000 Subject: - we now specify the object files in the subsystems config.m4 file I plan to convert all objectfile group to use SMB_SUBSYSTEM later I'll add a SMB_BINARY() and SMB_LIBRARY(), then there will be no more need to touch Makefile.in, because all make rules will be autogenerated by configure - convert the PROCESS_MODEL subsystem to this new scheme and move the pthread test to smbd/process_model.m4 - convert the CHARSET subsystem to this new scheme and move the iconv test to lib/iconv.m4 (This used to be commit 2e57ee884ebea194ee79ac20e84e385481b56aa2) --- source4/rpc_server/config.m4 | 10 ++++++---- source4/rpc_server/dcerpc_tcp.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/config.m4 b/source4/rpc_server/config.m4 index 7396d19546..8de6d273b9 100644 --- a/source4/rpc_server/config.m4 +++ b/source4/rpc_server/config.m4 @@ -1,7 +1,9 @@ dnl # DCERPC Server subsystem -SMB_MODULE(dcerpc_rpcecho, DCERPC, STATIC, \$(DCERPC_RPCECHO_OBJ), "bin/dcerpc_rpcecho.$SHLIBEXT$") -SMB_MODULE(dcerpc_epmapper, DCERPC, STATIC, \$(DCERPC_EPMAPPER_OBJ), "bin/dcerpc_epmapper.$SHLIBEXT$") -SMB_MODULE(dcerpc_remote, DCERPC, STATIC, \$(DCERPC_REMOTE_OBJ), "bin/dcerpc_remote.$SHLIBEXT$") +SMB_MODULE(dcerpc_rpcecho,DCERPC,STATIC,[rpc_server/echo/rpc_echo.o]) +SMB_MODULE(dcerpc_epmapper,DCERPC,STATIC,[rpc_server/epmapper/rpc_epmapper.o]) +SMB_MODULE(dcerpc_remote,DCERPC,STATIC,[rpc_server/remote/dcesrv_remote.o]) -SMB_SUBSYSTEM(DCERPC,rpc_server/dcerpc_server.o) +SMB_SUBSYSTEM(DCERPC,rpc_server/dcerpc_server.o, + [rpc_server/dcerpc_tcp.o rpc_server/dcesrv_auth.o rpc_server/handles.o], + rpc_server/dcesrv_public_proto.h) diff --git a/source4/rpc_server/dcerpc_tcp.c b/source4/rpc_server/dcerpc_tcp.c index cc7581ee2f..69cd9cad35 100644 --- a/source4/rpc_server/dcerpc_tcp.c +++ b/source4/rpc_server/dcerpc_tcp.c @@ -255,7 +255,7 @@ static void setup_listen_rpc(struct event_context *events, add a socket address to the list of events, one event per dcerpc endpoint */ static void add_socket_rpc(struct event_context *events, - struct model_ops *model_ops, + const struct model_ops *model_ops, struct in_addr *ifip) { struct dcesrv_endpoint *e; @@ -289,7 +289,7 @@ static void add_socket_rpc(struct event_context *events, Open the listening sockets for RPC over TCP ****************************************************************************/ void open_sockets_rpc(struct event_context *events, - struct model_ops *model_ops) + const struct model_ops *model_ops) { if (lp_interfaces() && lp_bind_interfaces_only()) { int num_interfaces = iface_count(); -- cgit