summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/wscript_build24
1 files changed, 13 insertions, 11 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index ed3646488e..6e2a35a373 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}'''
@@ -720,7 +718,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}
@@ -731,7 +729,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'
@@ -789,7 +788,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}
@@ -812,6 +811,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${LIBCLI_SAMR_SRC}
${LIBCLI_NETLOGON_SRC}
${RPC_CLIENT_SCHANNEL_SRC}
+ rpc_client/init_netlogon.c
${AUTH_SRC}
${PRIVILEGES_BASIC_SRC}'''
@@ -852,9 +852,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}'
@@ -871,11 +872,12 @@ 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}'''
+ ${RPC_CLIENT_SRC1}'''
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'