../librpc/gen_ndr/ndr_eventlog.c
${LIBNDR_NETLOGON_SRC}
../librpc/gen_ndr/ndr_dssetup.c
- ${LIBNDR_XATTR_SRC}
../librpc/gen_ndr/ndr_epmapper.c
../librpc/gen_ndr/ndr_ntsvcs.c
${LIBNDR_SPOOLSS_SRC}'''
LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
-LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}'
LIBSMB_SRC0 = '''
../libcli/auth/ntlm_check.c
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-REGFIO_SRC = '''registry/regfio.c'''
+REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
REGSRCS_SRC = '''registry/reg_objects.c'''
RPC_STATIC = ''
-RPC_LSA_SRC = '''rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
+RPC_LSARPC_SRC = '''rpc_server/srv_lsa_nt.c
+ ../librpc/gen_ndr/srv_lsa.c'''
-RPC_NETLOG_SRC = '''rpc_server/srv_netlog_nt.c
- ../librpc/gen_ndr/srv_netlogon.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_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
-RPC_REG_SRC = ''' rpc_server/srv_winreg_nt.c
- ../librpc/gen_ndr/srv_winreg.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_SVC_SRC = '''rpc_server/srv_srvsvc_nt.c
- ../librpc/gen_ndr/srv_srvsvc.c'''
+RPC_SRVSVC_SRC = '''rpc_server/srv_srvsvc_nt.c
+ ../librpc/gen_ndr/srv_srvsvc.c'''
-RPC_WKS_SRC = ''' ../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.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_DFS_SRC = ''' ../librpc/gen_ndr/srv_dfs.c rpc_server/srv_dfs_nt.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
RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
${RPC_NCACN_NP_INTERNAL}'''
-RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
+RPC_RPCECHO_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_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC} ${RPC_STATIC}'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
-PRIVILEGES_BASIC_SRC = '''lib/privileges_basic.c'''
+PRIVILEGES_BASIC_SRC = '''../libcli/security/privileges.c'''
PRIVILEGES_SRC = '''lib/privileges.c'''
${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
${AFS_SRC} ${AFS_SETTOKEN_SRC}
${LIBADS_SERVER_SRC}
- ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSA_SRC}
+ ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSARPC_SRC}
${TDB_VALIDATE_SRC}
${LIBCLI_DSSETUP_SRC}
${LIBCLI_LSA_SRC}
${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC} ${REG_FULL_SRC}
${BUILDOPT_SRC}
${LIBNET_SRC} ${LIBSMBCONF_SRC}
- ${RPC_LSA_SRC}
- ${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
- ${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
- ${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_SRC}
- ${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
- ${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
- ${RPC_ECHO_SRC}
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_WINREG_SRC}
${LIBCLI_SRVSVC_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
${AUTH_SRC}
- ${PRIVILEGES_BASIC_SRC}'''
+ ${PRIVILEGES_BASIC_SRC}
+ ${LIBNDR_XATTR_SRC}'''
PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
printing/print_cups.c printing/print_generic.c