[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Mon Sep 20 23:46:24 MDT 2010
The branch, v3-6-test has been updated
via 78b93e4 s3-build: further rationalise LIBMSRPC_OBJ and remove RPC_CLIENT_OBJ.
via 63e5490 s3-waf: further rationalise LIBMSRPC_SRC and remove RPC_CLIENT_SRC.
via 7bbd07d s3-build: remove RPC_CLIENT_OBJ1.
via b16aa5a s3-waf: remove RPC_CLIENT_SRC1.
via 4a6629b s3-build: use LIBMSRPC_OBJ instead of single files.
via 94b68a5 s3-waf: use LIBMSRPC_SRC instead of single files.
via dd7a6b7 s3-waf: only link in samr util code where needed.
via bc0636d s3-build: only link in samr util code where needed.
via 7bf7210 s3-build: remove RPC_PARSE_OBJ.
via 6900ea4 s3-waf: remove RPC_PARSE_SRC.
from 6b19ab3 s3-build: only link in epmapper client code where needed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 78b93e4ee7168b4f87c6c76f72d84e3f8c854de7
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:13:55 2010 +0200
s3-build: further rationalise LIBMSRPC_OBJ and remove RPC_CLIENT_OBJ.
Guenther
(cherry picked from commit c5ffecb136225dba294327cc3a437e5f17475253)
commit 63e549014adfe455f60c59615da8d3283a2f2c26
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:13:00 2010 +0200
s3-waf: further rationalise LIBMSRPC_SRC and remove RPC_CLIENT_SRC.
Guenther
(cherry picked from commit 6a795dd14674bfa2f6fe5206a9237f867c48e875)
commit 7bbd07dce90dbf76cc32feebb6809f8244cf37e7
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:05:34 2010 +0200
s3-build: remove RPC_CLIENT_OBJ1.
Guenther
(cherry picked from commit d6949f58fa82196fc67a87e6bf47a5c05698a734)
commit b16aa5ae82a78191f8af73738fe60fca34b2a029
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:05:16 2010 +0200
s3-waf: remove RPC_CLIENT_SRC1.
Guenther
(cherry picked from commit 75e55f9535d3a66933c901658c61e1fdaa596515)
commit 4a6629b52a9724ea0e9722b1d56ae61e3bce627e
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:03:42 2010 +0200
s3-build: use LIBMSRPC_OBJ instead of single files.
Guenther
(cherry picked from commit a52fde4f944bf8cfa2dd69498bdf6da8e39c0139)
commit 94b68a56262324c4f381fb5a8c5ed228bafff9e1
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 26 00:03:15 2010 +0200
s3-waf: use LIBMSRPC_SRC instead of single files.
Guenther
(cherry picked from commit 1217c4f48490e85ac953a3f285b0d9bacda0f243)
commit dd7a6b7fca7b2413fe21d5747f069703b1cea426
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 20 00:11:33 2010 +0200
s3-waf: only link in samr util code where needed.
Guenther
(cherry picked from commit 0b05e32f92cfc64de1c3ce02d1eb3ab4f8d5a25f)
commit bc0636d207cf11100012f8a33fc40155ee916d1e
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 20 00:10:14 2010 +0200
s3-build: only link in samr util code where needed.
Guenther
(cherry picked from commit 4991af46d75018c31ec80dc28c3eabd6e541b8ab)
commit 7bf7210f07a55304dc1772f32accd266477045ab
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 19 16:18:10 2010 +0200
s3-build: remove RPC_PARSE_OBJ.
Guenther
(cherry picked from commit ecf32c851a9b40d1f280e57770f8126420e52f86)
commit 6900ea40ab7ecc96afe5d18ea03557da83026510
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 19 16:25:55 2010 +0200
s3-waf: remove RPC_PARSE_SRC.
Guenther
(cherry picked from commit 83dc8314f1a688dc43ae5129fb7b1edb74670202)
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 100 +++++++++++++++++++++++-------------------------
source3/wscript_build | 56 +++++++++++++--------------
2 files changed, 75 insertions(+), 81 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c2e6f57..a7314e6 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -376,7 +376,8 @@ LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/cli_srvsvc.o \
LIBCLI_LSA_OBJ = librpc/gen_ndr/cli_lsa.o \
librpc/gen_ndr/ndr_lsa_c.o \
- rpc_client/cli_lsarpc.o
+ rpc_client/cli_lsarpc.o \
+ rpc_client/init_lsa.o
LIBCLI_SAMR_OBJ = librpc/gen_ndr/cli_samr.o \
librpc/gen_ndr/ndr_samr_c.o \
@@ -410,9 +411,6 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
# that requires knowledge of security contexts
REG_PARSE_PRS_OBJ = registry/reg_parse_prs.o
-RPC_PARSE_OBJ = rpc_client/init_netlogon.o \
- rpc_client/init_lsa.o
-
LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
@@ -595,18 +593,19 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
$(CLDAP_OBJ) \
$(DRSUAPI_OBJ)
-RPC_CLIENT_OBJ1 = $(SCHANNEL_OBJ)
-
-LIBMSRPC_OBJ = \
- $(RPC_CLIENT_OBJ1) \
- $(RPC_CLIENT_OBJ) \
- rpc_client/init_samr.o \
- ../librpc/rpc/binding.o
+LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
+ rpc_client/cli_pipe.o \
+ librpc/rpc/dcerpc_gssapi.o \
+ librpc/rpc/dcerpc_spnego.o \
+ librpc/rpc/rpc_common.o \
+ rpc_client/rpc_transport_np.o \
+ rpc_client/rpc_transport_sock.o \
+ ../librpc/rpc/binding.o \
+ ../librpc/rpc/dcerpc_util.o \
+ ../librpc/rpc/binding_handle.o \
+ librpc/rpc/dcerpc_helpers.o
LIBMSRPC_GEN_OBJ = $(LIBCLI_EPMAPPER_OBJ) \
- ../librpc/rpc/dcerpc_util.o \
- ../librpc/rpc/binding_handle.o \
- librpc/rpc/dcerpc_helpers.o \
$(LIBNDR_GEN_OBJ)
#
@@ -717,14 +716,9 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
- $(RPC_CLIENT_SCHANNEL_OBJ)
-
-RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
- librpc/rpc/dcerpc_gssapi.o \
- librpc/rpc/dcerpc_spnego.o \
- librpc/rpc/rpc_common.o \
- rpc_client/rpc_transport_np.o \
- rpc_client/rpc_transport_sock.o
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
@@ -891,7 +885,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
$(MANGLE_OBJ) @VFS_STATIC@
SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
- $(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) \
+ $(RPC_SERVER_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
$(NOTIFY_OBJ) $(FNAME_UTIL_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
@@ -942,9 +936,10 @@ SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
$(PASSCHANGE_OBJ) $(FNAME_UTIL_OBJ) \
- $(LIBCLI_SAMR_OBJ)
+ $(LIBCLI_SAMR_OBJ) \
+ rpc_client/init_lsa.o
STATUS_OBJ = utils/status.o utils/status_profile.o \
$(LOCKING_OBJ) $(PARAM_OBJ) \
@@ -957,10 +952,9 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
- $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ) \
- $(RPC_CLIENT_OBJ1) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIBMSRPC_GEN_OBJ) \
+ $(LIBMSRPC_OBJ) \
$(LIBCLI_SRVSVC_OBJ)
TESTPARM_OBJ = utils/testparm.o \
@@ -980,9 +974,10 @@ PASSWD_UTIL_OBJ = utils/passwd_util.o
SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
$(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
- $(LIBCLI_SAMR_OBJ)
+ $(LIBCLI_SAMR_OBJ) \
+ rpc_client/init_lsa.o
PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
$(LIBSAMBA_OBJ) $(LIBTSOCKET_OBJ) \
@@ -1005,7 +1000,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
$(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBADS_OBJ) $(POPT_LIB_OBJ) \
$(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
@@ -1021,7 +1016,9 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
- $(RPC_CLIENT_SCHANNEL_OBJ)
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1047,7 +1044,7 @@ LIBSMBCLIENT_OBJ0 = \
LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIBCLI_SRVSVC_OBJ) \
$(LIBCLI_LSA_OBJ)
@@ -1061,14 +1058,12 @@ LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
LIBBIGBALLOFMUD_MAJOR = 0
LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) \
+ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(PASSDB_OBJ) \
$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
-CLIENT_OBJ1 = client/client.o client/clitar.o $(RPC_CLIENT_OBJ) \
- ../librpc/rpc/binding.o \
+CLIENT_OBJ1 = client/client.o client/clitar.o \
client/dnsbrowse.o \
- $(RPC_CLIENT_OBJ1) \
- $(RPC_PARSE_OBJ)
+ $(LIBMSRPC_OBJ)
CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1135,7 +1130,10 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
- $(RPC_CLIENT_SCHANNEL_OBJ)
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
+
# these are not processed by make proto
NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
@@ -1143,7 +1141,7 @@ NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
NET_OBJ = $(NET_OBJ1) \
$(NET_OBJ2) @FAKE_KASERVER_OBJ@\
$(PARAM_WITHOUT_REG_OBJ) $(LIBSMB_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+ $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(LIBADS_PRINTER_OBJ) $(POPT_LIB_OBJ) \
@@ -1205,14 +1203,14 @@ LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
$(LIBNDR_GEN_OBJ0) $(FNAME_UTIL_OBJ)
SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
+ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
$(LIBCLI_LSA_OBJ)
SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PARAM_OBJ) \
- $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIBCLI_LSA_OBJ)
@@ -1373,7 +1371,7 @@ WINBINDD_OBJ1 = \
WINBINDD_OBJ = \
$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
@@ -1384,7 +1382,9 @@ WINBINDD_OBJ = \
$(LIBCLI_DSSETUP_OBJ) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
- $(LIBCLI_NETLOGON_OBJ)
+ $(LIBCLI_NETLOGON_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -1438,13 +1438,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
$(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIB_NONSMBD_OBJ) \
$(KRBCLIENT_OBJ) \
- $(RPC_PARSE_OBJ) \
- $(RPC_CLIENT_OBJ1) \
- librpc/rpc/rpc_common.o \
- rpc_client/cli_pipe.o \
- librpc/rpc/dcerpc_gssapi.o \
- librpc/rpc/dcerpc_spnego.o \
- ../librpc/rpc/binding.o \
+ $(LIBMSRPC_OBJ) \
$(LIBMSRPC_GEN_OBJ)
DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \
@@ -2298,7 +2292,7 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
$(REG_SMBCONF_OBJ) \
$(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
auth/token_util.o \
@@ -2308,7 +2302,9 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
- $(RPC_CLIENT_SCHANNEL_OBJ)
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
diff --git a/source3/wscript_build b/source3/wscript_build
index b301608..51d9a1f 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -122,7 +122,8 @@ LIBCLI_SRVSVC_SRC = '''
LIBCLI_LSA_SRC = '''
librpc/gen_ndr/cli_lsa.c
librpc/gen_ndr/ndr_lsa_c.c
- rpc_client/cli_lsarpc.c'''
+ rpc_client/cli_lsarpc.c
+ rpc_client/init_lsa.c'''
LIBCLI_SAMR_SRC = '''
librpc/gen_ndr/cli_samr.c
@@ -162,9 +163,6 @@ LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-RPC_PARSE_SRC = '''rpc_client/init_netlogon.c
- rpc_client/init_lsa.c'''
-
LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
@@ -350,19 +348,21 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
${CLDAP_SRC}
${DRSUAPI_SRC}'''
-RPC_CLIENT_SRC1 = '''${SCHANNEL_SRC}'''
-
LIBMSRPC_SRC = '''
- ${RPC_CLIENT_SRC1}
- ${RPC_CLIENT_SRC}
- rpc_client/init_samr.c
- ../librpc/rpc/binding.c'''
+ ${SCHANNEL_SRC}
+ rpc_client/cli_pipe.c
+ librpc/rpc/rpc_common.c
+ librpc/rpc/dcerpc_gssapi.c
+ librpc/rpc/dcerpc_spnego.c
+ rpc_client/rpc_transport_np.c
+ rpc_client/rpc_transport_sock.c
+ ../librpc/rpc/binding.c
+ ../librpc/rpc/dcerpc_util.c
+ librpc/rpc/dcerpc_helpers.c
+ ../librpc/rpc/binding_handle.c'''
LIBMSRPC_GEN_SRC = '''
${LIBCLI_EPMAPPER_SRC}
- ../librpc/rpc/dcerpc_util.c
- librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
${LIBNDR_GEN_SRC}'''
#
@@ -471,13 +471,6 @@ RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
#TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
-RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
- librpc/rpc/rpc_common.c
- librpc/rpc/dcerpc_gssapi.c
- librpc/rpc/dcerpc_spnego.c
- rpc_client/rpc_transport_np.c
- rpc_client/rpc_transport_sock.c'''
-
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
@@ -719,7 +712,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC} ${RPC_PARSE_SRC}
+ ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
${PROFILE_SRC} ${SLCACHE_SRC}
${LIBADS_SRC}
${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
@@ -730,7 +723,8 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
${LIBCLI_DSSETUP_SRC}
${LIBCLI_LSA_SRC}
${LIBCLI_SAMR_SRC}
- ${LIBCLI_NETLOGON_SRC}'''
+ ${LIBCLI_NETLOGON_SRC}
+ rpc_client/init_netlogon.c'''
LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
@@ -788,7 +782,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
${MANGLE_SRC} ${VFS_STATIC}'''
SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
- ${RPC_SERVER_SRC} ${RPC_PARSE_SRC}
+ ${RPC_SERVER_SRC}
${LOCKING_SRC} ${PRINTING_SRC}
${PROFILE_SRC} ${PRINTBACKEND_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
@@ -811,6 +805,8 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
${RPC_CLIENT_SCHANNEL_SRC}
+ rpc_client/init_netlogon.c
+ rpc_client/init_samr.c
${AUTH_SRC}
${PRIVILEGES_BASIC_SRC}'''
@@ -851,9 +847,10 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c web/statuspage.c
SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
- ${RPC_PARSE_SRC} ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+ ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
- ${LIBCLI_SAMR_SRC}'''
+ ${LIBCLI_SAMR_SRC}
+ rpc_client/init_lsa.c'''
WBINFO_SRC = '../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'
@@ -868,13 +865,14 @@ EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}
DISPLAY_SEC_SRC= '../libcli/security/display_sec.c'
-CLIENT_SRC1 = '''client/client.c client/clitar.c ${RPC_CLIENT_SRC}
- ../librpc/rpc/binding.c client/dnsbrowse.c
- ${RPC_CLIENT_SRC1} ${RPC_PARSE_SRC}'''
+CLIENT_SRC1 = '''client/client.c client/clitar.c
+ client/dnsbrowse.c
+ ${LIBMSRPC_SRC}'''
CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
${READLINE_SRC} ${DISPLAY_SEC_SRC}
- ${LIBCLI_SRVSVC_SRC}'''
+ ${LIBCLI_SRVSVC_SRC}
+ rpc_client/init_lsa.c'''
LIBS='ICONV'
--
Samba Shared Repository
More information about the samba-cvs
mailing list