librpc/gen_ndr/cli_dssetup.c
librpc/gen_ndr/ndr_dssetup_c.c'''
+LIBCLI_SVCCTL_SRC = '''
+ librpc/gen_ndr/cli_svcctl.c
+ librpc/gen_ndr/ndr_svcctl_c.c'''
+
+LIBCLI_WKSSVC_SRC = '''
+ librpc/gen_ndr/cli_wkssvc.c
+ librpc/gen_ndr/ndr_wkssvc_c.c'''
+
+LIBCLI_SRVSVC_SRC = '''
+ librpc/gen_ndr/cli_srvsvc.c
+ librpc/gen_ndr/ndr_srvsvc_c.c'''
+
+LIBCLI_LSA_SRC = '''
+ librpc/gen_ndr/cli_lsa.c
+ librpc/gen_ndr/ndr_lsa_c.c
+ rpc_client/cli_lsarpc.c
+ rpc_client/init_lsa.c'''
+
+LIBCLI_SAMR_SRC = '''
+ librpc/gen_ndr/cli_samr.c
+ librpc/gen_ndr/ndr_samr_c.c
+ rpc_client/cli_samr.c'''
+
+LIBCLI_NETLOGON_SRC = '''
+ librpc/gen_ndr/cli_netlogon.c
+ librpc/gen_ndr/ndr_netlogon_c.c
+ rpc_client/cli_netlogon.c'''
+
+LIBCLI_EPMAPPER_SRC = '''
+ librpc/gen_ndr/cli_epmapper.c
+ librpc/gen_ndr/ndr_epmapper_c.c'''
+
LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
${LIBNDR_GEN_SRC0}
../librpc/gen_ndr/ndr_dfs.c
../librpc/gen_ndr/ndr_eventlog.c
${LIBNDR_NETLOGON_SRC}
../librpc/gen_ndr/ndr_dssetup.c
- librpc/gen_ndr/ndr_notify.c
- ${LIBNDR_XATTR_SRC}
../librpc/gen_ndr/ndr_epmapper.c
- ../librpc/gen_ndr/ndr_named_pipe_auth.c
../librpc/gen_ndr/ndr_ntsvcs.c
${LIBNDR_SPOOLSS_SRC}'''
# 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}'''
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
${CLDAP_SRC}
${DRSUAPI_SRC}'''
-RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
- ${SCHANNEL_SRC}'''
-
-LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
- ${RPC_CLIENT_SRC1}
- ${RPC_CLIENT_SRC}
- rpc_client/init_samr.c
- ../librpc/rpc/binding.c'''
-
-DCERPC_CLIENT_GEN_SRC = '''
- ../librpc/gen_ndr/ndr_lsa_c.c
- ../librpc/gen_ndr/ndr_srvsvc_c.c
- ../librpc/gen_ndr/ndr_svcctl_c.c
- ../librpc/gen_ndr/ndr_wkssvc_c.c
- ../librpc/gen_ndr/ndr_netlogon_c.c
- ../librpc/gen_ndr/ndr_samr_c.c
- ../librpc/gen_ndr/ndr_epmapper_c.c'''
-
-LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
- ../librpc/gen_ndr/cli_srvsvc.c
- ../librpc/gen_ndr/cli_svcctl.c
- ../librpc/gen_ndr/cli_wkssvc.c
- ../librpc/gen_ndr/cli_netlogon.c
- ../librpc/gen_ndr/cli_samr.c
- ../librpc/gen_ndr/cli_epmapper.c
- ${DCERPC_CLIENT_GEN_SRC}
- ../librpc/rpc/dcerpc_util.c
- librpc/rpc/dcerpc_helpers.c
- ../librpc/rpc/binding_handle.c
+LIBMSRPC_SRC = '''
+ ${SCHANNEL_SRC}
+ rpc_client/cli_pipe.c
+ librpc/rpc/rpc_common.c
+ librpc/rpc/dcerpc_gssapi.c
+ librpc/rpc/dcerpc_krb5.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}
${LIBNDR_GEN_SRC}'''
#
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_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
-NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c'''
+NPA_TSTREAM_SRC = '''../libcli/named_pipe_auth/npa_tstream.c
+ ../librpc/gen_ndr/ndr_named_pipe_auth.c'''
RPC_NCACN_NP_INTERNAL = '''rpc_server/srv_pipe_register.c rpc_server/rpc_ncacn_np_internal.c
rpc_server/rpc_handles.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_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'''
-PRIVILEGES_BASIC_SRC = '''lib/privileges_basic.c'''
+PRIVILEGES_BASIC_SRC = '''../libcli/security/privileges.c'''
PRIVILEGES_SRC = '''lib/privileges.c'''
PDB_STATIC = ''
PDB_TDBSAM_SRC = 'passdb/pdb_tdb.c'
-PDB_LDAP_SRC = 'passdb/pdb_ldap.c'
+PDB_LDAP_SRC = 'passdb/pdb_ldap.c passdb/pdb_nds.c'
PDB_ADS_SRC = 'passdb/pdb_ads.c'
PDB_SMBPASSWD_SRC = 'passdb/pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'passdb/pdb_wbc_sam.c'
OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
smbd/oplock_onefs.c'''
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c
+ librpc/gen_ndr/ndr_notify.c'''
FNAME_UTIL_SRC = '''smbd/filename_util.c'''
AUTH_STATIC = ''
AUTH_SRC = '''${AUTH_STATIC} auth/auth.c auth/auth_util.c auth/token_util.c
auth/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
- auth/user_util.c auth/server_info.c auth/server_info_sam.c
+ auth/user_util.c auth/user_krb5.c auth/server_info.c auth/server_info_sam.c
${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
#FIXME: set IDMAP_STATIC during configuration
../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}
${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_DSSETUP_SRC}
+ ${LIBCLI_LSA_SRC}
+ ${LIBCLI_SAMR_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'
${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}
${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}
+ ${LIBCLI_LSA_SRC}
+ ${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}'''
+ ${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
SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
- ${RPC_PARSE_SRC} ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
- ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}'''
+ ${LIBMSRPC_GEN_SRC} ${LIBMSRPC_SRC}
+ ${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
+ ${LIBCLI_SAMR_SRC}
+ rpc_client/init_lsa.c'''
WBINFO_SRC = '../nsswitch/wbinfo.c ${AFS_SETTOKEN_SRC}'
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}'''
+ ${READLINE_SRC} ${DISPLAY_SEC_SRC}
+ ${LIBCLI_SRVSVC_SRC}
+ rpc_client/init_lsa.c'''
LIBS='ICONV'