git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3-waf: use LIBMSRPC_SRC instead of single files.
[samba.git] / source3 / wscript_build
diff --git a/source3/wscript_build b/source3/wscript_build
index 677f5ab306806665bc547ae3d4fd73444fed265e..157b70ce17fb2f20209f51d84e8ff34b628fca7f 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -54,17 +54,91 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
              librpc/ndr/util.c
              ../librpc/gen_ndr/ndr_dcerpc.c'''
 
-RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
-
 LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
                   ../librpc/gen_ndr/ndr_lsa.c'''
 
 LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
                   ../librpc/ndr/ndr_netlogon.c'''
 
+LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
+                  ../librpc/ndr/ndr_schannel.c'''
+
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
+LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
+                  ../librpc/ndr/ndr_xattr.c'''
+
+LIBCLI_SPOOLSS_SRC = '''
+                     librpc/gen_ndr/cli_spoolss.c
+                     librpc/gen_ndr/ndr_spoolss_c.c
+                     rpc_client/cli_spoolss.c
+                     rpc_client/init_spoolss.c'''
+
+LIBCLI_EVENTLOG_SRC = '''
+                      librpc/gen_ndr/cli_eventlog.c
+                      librpc/gen_ndr/ndr_eventlog_c.c'''
+
+LIBCLI_WINREG_SRC = '''
+                    librpc/gen_ndr/cli_winreg.c
+                    librpc/gen_ndr/ndr_winreg_c.c'''
+
+LIBCLI_NTSVCS_SRC = '''
+                    librpc/gen_ndr/cli_ntsvcs.c
+                    librpc/gen_ndr/ndr_ntsvcs_c.c'''
+
+LIBCLI_DRSUAPI_SRC = '''
+                     librpc/gen_ndr/cli_drsuapi.c
+                     librpc/gen_ndr/ndr_drsuapi_c.c'''
+
+LIBCLI_DFS_SRC = '''
+                 librpc/gen_ndr/cli_dfs.c
+                 librpc/gen_ndr/ndr_dfs_c.c'''
+
+LIBCLI_ECHO_SRC = '''
+                  librpc/gen_ndr/cli_echo.c
+                  librpc/gen_ndr/ndr_echo_c.c'''
+
+LIBCLI_INITSHUTDOWN_SRC = '''
+                          librpc/gen_ndr/cli_initshutdown.c
+                          librpc/gen_ndr/ndr_initshutdown_c.c'''
+
+LIBCLI_DSSETUP_SRC = '''
+                     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
@@ -76,20 +150,18 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_NETLOGON_SRC}
                  ../librpc/gen_ndr/ndr_dssetup.c
                  librpc/gen_ndr/ndr_notify.c
-                 ../librpc/gen_ndr/ndr_xattr.c
-                 ../librpc/ndr/ndr_xattr.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}'''
 
+LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
+                           ../librpc/ndr/ndr_ntprinting.c'''
+
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
-RPC_PARSE_SRC1 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
-
-RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
-                 rpc_client/init_netlogon.c
-                 rpc_client/init_lsa.c'''
+REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
 LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
 
@@ -135,6 +207,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC} ${CRYPTO_SRC}
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
           lib/talloc_dict.c
+          lib/util_sconn.c
           lib/serverid.c
           lib/util_transfer_file.c ../lib/async_req/async_sock.c
           ${TDB_LIB_SRC}
@@ -198,13 +271,17 @@ LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
               ${GPEXT_SRC}'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
-LIBADS_SRC = '''libads/ldap.c libads/ldap_printer.c
+LIBADS_SRC = '''libads/ldap.c
              libads/sasl.c libads/sasl_wrapping.c
-             libads/krb5_setpw.c libads/ldap_user.c
+             libads/krb5_setpw.c
+             libads/kerberos_util.c
+             libads/ldap_user.c
              libads/ads_struct.c libads/kerberos_keytab.c
-             libads/disp_sec.c libads/ads_utils.c libads/ldap_utils.c
+             libads/disp_sec.c libads/ldap_utils.c
              libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
+LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
+
 LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
                     ../librpc/ndr/ndr_krb5pac.c
                     ../librpc/gen_ndr/ndr_krb5pac.c'''
@@ -229,15 +306,17 @@ LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SR
 
 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} ${RPC_PARSE_SRC1}'
+LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
 
 LIBSMB_SRC0 = '''
                ../libcli/auth/ntlm_check.c
                libsmb/ntlmssp.c
+               libsmb/ntlmssp_wrap.c
                ../libcli/auth/ntlmssp.c
                ../libcli/auth/ntlmssp_sign.c
                ${LIBNDR_NTLMSSP_SRC}
-               ../libcli/auth/ntlmssp_ndr.c'''
+               ../libcli/auth/ntlmssp_ndr.c
+              ../libcli/auth/ntlmssp_server.c'''
 
 LIBSAMBA_SRC = '${LIBSMB_SRC0}'
 
@@ -254,8 +333,7 @@ TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 SCHANNEL_SRC = '''../libcli/auth/credentials.c
                ../libcli/auth/schannel_sign.c
                ../libcli/auth/schannel_state_tdb.c
-               ../librpc/gen_ndr/ndr_schannel.c
-               ../librpc/ndr/ndr_schannel.c'''
+               ${LIBNDR_SCHANNEL_SRC}'''
 
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clikrb5.c libsmb/clispnego.c
@@ -271,35 +349,19 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
-RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
-                  ${SCHANNEL_SRC}'''
+RPC_CLIENT_SRC1 = '''${SCHANNEL_SRC}'''
 
-LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
+LIBMSRPC_SRC = '''
                ${RPC_CLIENT_SRC1}
                ${RPC_CLIENT_SRC}
-               rpc_client/cli_spoolss.c
-               rpc_client/init_spoolss.c
-               rpc_client/init_samr.c
                    ../librpc/rpc/binding.c'''
 
-LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
-                   ../librpc/gen_ndr/cli_dfs.c
-                   ../librpc/gen_ndr/cli_echo.c
-                   ../librpc/gen_ndr/cli_srvsvc.c
-                   ../librpc/gen_ndr/cli_svcctl.c
-                   ../librpc/gen_ndr/cli_winreg.c
-                   ../librpc/gen_ndr/cli_initshutdown.c
-                   ../librpc/gen_ndr/cli_eventlog.c
-                   ../librpc/gen_ndr/cli_wkssvc.c
-                   ../librpc/gen_ndr/cli_netlogon.c
-                   ../librpc/gen_ndr/cli_samr.c
-                   ../librpc/gen_ndr/cli_dssetup.c
-                   ../librpc/gen_ndr/cli_ntsvcs.c
-                   ../librpc/gen_ndr/cli_epmapper.c
-                   ../librpc/gen_ndr/cli_drsuapi.c
-                   ../librpc/gen_ndr/cli_spoolss.c
-                   ${LIBNDR_GEN_SRC}
-                   ${RPCCLIENT_NDR_SRC}'''
+LIBMSRPC_GEN_SRC = '''
+                   ${LIBCLI_EPMAPPER_SRC}
+                   ../librpc/rpc/dcerpc_util.c
+                   librpc/rpc/dcerpc_helpers.c
+                   ../librpc/rpc/binding_handle.c
+                   ${LIBNDR_GEN_SRC}'''
 
 #
 # registry-related objects
@@ -407,10 +469,14 @@ 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_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
+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_SRC = '''rpc_client/cli_pipe.c rpc_client/rpc_transport_np.c
-        rpc_client/rpc_transport_sock.c rpc_client/rpc_transport_smbd.c'''
+RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
 
 LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
 
@@ -561,6 +627,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_misc.c
                    winbindd/winbindd_cm.c
                    winbindd/winbindd_wins.c
+                   winbindd/winbindd_msrpc.c
                    winbindd/winbindd_rpc.c
                    winbindd/winbindd_reconnect.c
                    winbindd/winbindd_ads.c
@@ -571,6 +638,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    librpc/gen_ndr/cli_wbint.c
                    librpc/gen_ndr/srv_wbint.c
                    librpc/gen_ndr/ndr_wbint.c
+                   librpc/gen_ndr/ndr_wbint_c.c
                    winbindd/winbindd_async.c
                    winbindd/winbindd_creds.c
                    winbindd/winbindd_cred_cache.c
@@ -632,9 +700,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_check_machine_acct.c
                    winbindd/winbindd_change_machine_acct.c
                    winbindd/winbindd_ping_dc.c
-                   winbindd/winbindd_set_mapping.c
-                   winbindd/winbindd_remove_mapping.c
-                   winbindd/winbindd_set_hwm.c
                    winbindd/winbindd_pam_auth.c
                    winbindd/winbindd_pam_logoff.c
                    winbindd/winbindd_pam_chauthtok.c
@@ -652,14 +717,19 @@ 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}
                   ${AFS_SRC} ${AFS_SETTOKEN_SRC}
                   ${LIBADS_SERVER_SRC}
-                  ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSA_OBJ}
-                  ${TDB_VALIDATE_SRC}'''
+                  ${RPC_NCACN_NP_INTERNAL} ${RPC_SAMR_SRC} ${RPC_LSA_SRC}
+                  ${TDB_VALIDATE_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'
 
@@ -685,7 +755,8 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
                smbd/posix_acls.c lib/sysacls.c
                smbd/process.c smbd/service.c smbd/error.c
-               printing/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
+               printing/printspoolss.c
+               lib/sysquotas.c lib/sysquotas_linux.c
                lib/sysquotas_xfs.c lib/sysquotas_4A.c
                smbd/fake_file.c
                smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
@@ -716,13 +787,13 @@ 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}
                 ${LIBMSRPC_SRC}
                 ${LIBMSRPC_GEN_SRC} ${LIBADS_SRC}
-                ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
+                ${LIBADS_SERVER_SRC} ${LIBADS_PRINTER_SRC} ${REG_FULL_SRC}
                 ${BUILDOPT_SRC}
                 ${LIBNET_SRC} ${LIBSMBCONF_SRC}
                 ${RPC_LSA_SRC}
@@ -732,6 +803,15 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${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}'''
 
@@ -741,7 +821,13 @@ PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
                printing/print_iprint.c'''
 
 PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
-PRINTBACKEND_SRC = 'printing/printing.c printing/nt_printing.c ${PRINTBASE_SRC}'
+PRINTBACKEND_SRC = '''printing/printing.c
+                      printing/nt_printing.c
+                      printing/nt_printing_tdb.c
+                      printing/nt_printing_migrate.c
+                      printing/nt_printing_ads.c
+                      ${LIBNDR_NTPRINTING_SRC}
+                      ${PRINTBASE_SRC}'''
 
 SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''
 
@@ -766,8 +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}
-           ${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}'
 
@@ -782,12 +870,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_SRC2}'''
+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'
@@ -887,7 +977,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 
 bld.SAMBA_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
-                    deps='krb5 gssapi gssapi_krb5',
+                    deps='krb5 k5crypto com_err gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBS',
Samba Shared Repository